diff options
| author | 2014-10-10 00:31:53 +0000 | |
|---|---|---|
| committer | 2014-10-10 00:31:53 +0000 | |
| commit | df9cab2f129adcf5ca85369f155ab13193cd46b3 (patch) | |
| tree | e3182c6de8b5543a6fd9a8b44cd17ebb226a2141 | |
| parent | a6a6f4b218b9801be842207fe93c74e1f076cb68 (diff) | |
| parent | ad716e42e89cc5fe92c3ff86ec2714c416d522aa (diff) | |
am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem
* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa':
Fix bug 17931760 - spurious timeout leads to mayhem
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 4d2df2473d84..3694d61fe4d3 100644 --- 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) { |