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

* commit 'df9cab2f129adcf5ca85369f155ab13193cd46b3':
  Fix bug 17931760 - spurious timeout leads to mayhem
This commit is contained in:
Christopher Tate
2014-10-10 00:41:28 +00:00
committed by Android Git Automerger

View File

@@ -2415,6 +2415,11 @@ public class BackupManagerService extends IBackupManager.Stub {
mStatus = invokeAgentForBackup(PACKAGE_MANAGER_SENTINEL, mStatus = invokeAgentForBackup(PACKAGE_MANAGER_SENTINEL,
IBackupAgent.Stub.asInterface(pmAgent.onBind()), mTransport); IBackupAgent.Stub.asInterface(pmAgent.onBind()), mTransport);
addBackupTrace("PMBA invoke: " + mStatus); 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) { if (mStatus == BackupTransport.TRANSPORT_NOT_INITIALIZED) {