Merge "38380566 Notifiy the default sms app when restoration is complete"
diff --git a/src/com/android/providers/telephony/TelephonyBackupAgent.java b/src/com/android/providers/telephony/TelephonyBackupAgent.java
index 0a0ebb6..5f6eb10 100644
--- a/src/com/android/providers/telephony/TelephonyBackupAgent.java
+++ b/src/com/android/providers/telephony/TelephonyBackupAgent.java
@@ -527,6 +527,8 @@
}
Arrays.sort(files, mFileComparator);
+ boolean didRestore = false;
+
for (File file : files) {
final String fileName = file.getName();
if (DEBUG) {
@@ -534,6 +536,7 @@
}
try (FileInputStream fileInputStream = new FileInputStream(file)) {
mTelephonyBackupAgent.doRestoreFile(fileName, fileInputStream.getFD());
+ didRestore = true;
} catch (Exception e) {
// Either IOException or RuntimeException.
Log.e(TAG, "onHandleIntent", e);
@@ -541,6 +544,15 @@
file.delete();
}
}
+ if (didRestore) {
+ // Tell the default sms app to do a full sync now that the messages have been
+ // restored.
+ if (DEBUG) {
+ Log.d(TAG, "onHandleIntent done - notifying default sms app");
+ }
+ ProviderUtil.notifyIfNotDefaultSmsApp(null /*uri*/, null /*calling package*/,
+ this);
+ }
} finally {
sIsRestoring = false;
mWakeLock.release();