diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-07 10:46:10 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-07-07 10:46:10 -0700 |
| commit | 2fe00adc02cb3fdcad8374bf624118d5c3d5575e (patch) | |
| tree | 085c6689594e1f22aadf2ce392b9f05f405e2096 /services/backup | |
| parent | 20f71891c4ae420398b96cc6a77f0c43316e6717 (diff) | |
| download | frameworks_base-2fe00adc02cb3fdcad8374bf624118d5c3d5575e.zip frameworks_base-2fe00adc02cb3fdcad8374bf624118d5c3d5575e.tar.gz frameworks_base-2fe00adc02cb3fdcad8374bf624118d5c3d5575e.tar.bz2 | |
Clean up obsolete pending timeout after restoring package metadata
Bug 22040047
Change-Id: I460dbcc50a45d794392beb9ff4a4358c05c87e07
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index ed48f91..bf41f0f 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -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 |