Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1afb9b9 authored by Christopher Tate's avatar Christopher Tate Committed by The Android Automerger
Browse files

Fix bug 17931760 - spurious timeout leads to mayhem 

We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.

Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
parent 980276e3

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

+5 −0
Original line number Diff line number Diff line
@@ -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) {