am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem

* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa': Fix bug 17931760 - spurious timeout leads to mayhem
2014-10-10 00:31:53 +00:00
parent a6a6f4b218 ad716e42e8
commit df9cab2f12
1 changed files with 5 additions and 0 deletions
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -2415,6 +2415,11 @@ public class BackupManagerService extends IBackupManager.Stub {
                    mStatus = invokeAgentForBackup(PACKAGE_MANAGER_SENTINEL,
                            IBackupAgent.Stub.asInterface(pmAgent.onBind()), mTransport);
                    addBackupTrace("PMBA invoke: " + mStatus);
+
+                    // Because the PMBA is a local instance, it has already executed its
+                    // backup callback and returned.  Blow away the lingering (spurious)
+                    // pending timeout message for it.
+                    mBackupHandler.removeMessages(MSG_TIMEOUT);
                }

                if (mStatus == BackupTransport.TRANSPORT_NOT_INITIALIZED) {