commit b03b6a6c5a88e4c55d936ec028dd55a699ae787f
author Christopher Tate <ctate@google.com> Thu Oct 09 19:08:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 19:08:33 2014 +0000
tree 3bc6be4b04a79e24c40cd7ebe4657746e3611435
parent f91222327e71edccb5b5d34fde61abc54f580fab
parent 6dea8de7097eb91c9595cea63acd489e34c63aac

am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev

* commit '6dea8de7097eb91c9595cea63acd489e34c63aac':
  Actually tell the widget service that restore is starting

services/backup/java/com/android/server/backup/BackupManagerService.java

diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 9a5ffbd..4d2df24 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -7048,6 +7048,11 @@
         private  void startRestore() {
             sendStartRestore(mAcceptSet.size());
 
+            // If we're starting a full-system restore, set up to begin widget ID remapping
+            if (mIsSystemRestore) {
+                AppWidgetBackupBridge.restoreStarting(UserHandle.USER_OWNER);
+            }
+
             try {
                 String transportDir = mTransport.transportDirName();
                 mStateDir = new File(mBaseStateDir, transportDir);