38380566 Notifiy the default sms app when restoration is complete
* When the TelephonyBackupAgent is done restoring all the messages
from the backup file set, notify the default sms app with a null uri.
That triggers the sms app to do a full sync from the telephony db.
Test: Used the following manual steps to an initiate a restore:
adb shell bmgr list transports
adb shell bmgr transport android/com.android.internal.backup.LocalTransport
adb push ~/Downloads/com.android.providers.telephony /data/cache/backup/1/_full/com.android.providers.telephony
adb shell bmgr restore 1 com.android.providers.telephony
Then verified in the logs that:
1) The telephony restore triggered sending an intent to the default
sms app:
05-23 10:28:54.241 1711 5987 D SmsProvider: notifyIfNotDefaultSmsApp - called from null, notifying
2) The default sms app (bugle) received the intent:
05-23 10:28:54.271 4975 4975 V Bugle : TelephonyChangeReceiver.onReceive Intent { act=android.provider.action.EXTERNAL_PROVIDER_CHANGE flg=0x20000010 cmp=com.google.android.apps.messaging/.shared.receiver.TelephonyChangeReceiver }
3) Bugle recognized the intent as one without a uri, hence triggering
a full sync:
05-23 10:28:54.273 4975 4995 I BugleDataModel: ProcessTelephonyChangeAction: external telephony provider change null
05-23 10:28:54.276 4975 4995 I BugleDataModel: ProcessTelephonyChangeAction: not single message change, force full sync
4) Verified in the app the messages were restored.
Change-Id: I16592d1173e92333fca2e4820862fc737eebe6b4
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();