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

Commit 4198f62c authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am c2ef1fbe: am 0546b1b1: am 7bc8f51a: Merge "Clean up obsolete pending... 

am c2ef1fbe: am 0546b1b1: am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev

* commit 'c2ef1fbe':
  Clean up obsolete pending timeout after restoring package metadata
parents 5444b6be c2ef1fbe

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

+4 −1
Original line number Diff line number Diff line
@@ -7514,7 +7514,10 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
                // of it is process-local and therefore synchronous.  That means that the

                // next-state message (RUNNING_QUEUE) is already enqueued.  Only if we're

                // unable to proceed with running the queue do we remove that pending

                // message and jump straight to the FINAL state.

                // message and jump straight to the FINAL state.  Because this was

                // synchronous we also know that we should cancel the pending timeout

                // message.

                mBackupHandler.removeMessages(MSG_TIMEOUT);



                // Verify that the backup set includes metadata.  If not, we can't do

                // signature/version verification etc, so we simply do not proceed with