From 2fe00adc02cb3fdcad8374bf624118d5c3d5575e Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 7 Jul 2015 10:46:10 -0700 Subject: [PATCH] Clean up obsolete pending timeout after restoring package metadata Bug 22040047 Change-Id: I460dbcc50a45d794392beb9ff4a4358c05c87e07 --- .../java/com/android/server/backup/BackupManagerService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index ed48f91d0a26a..bf41f0f120a4a 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