Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0546b1b14939523f74534572538de4dcefba698b':
  Clean up obsolete pending timeout after restoring package metadata
This commit is contained in:
Christopher Tate
2015-07-07 20:18:13 +00:00
committed by Android Git Automerger
parent 1656c02468 0546b1b149
commit c2ef1fbe22
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -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 // of it is process-local and therefore synchronous. That means that the
// next-state message (RUNNING_QUEUE) is already enqueued. Only if we're // next-state message (RUNNING_QUEUE) is already enqueued. Only if we're
// unable to proceed with running the queue do we remove that pending // 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 // Verify that the backup set includes metadata. If not, we can't do
// signature/version verification etc, so we simply do not proceed with // signature/version verification etc, so we simply do not proceed with