diff options
author | Christopher Tate <ctate@google.com> | 2011-03-03 17:30:32 -0800 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2011-03-03 17:30:32 -0800 |
commit | 2a935096db65857b32bcc5c1e1403cc65871a2a9 (patch) | |
tree | ffe13a32b8019d0e7b00f79b36faca95dbd357c8 /services/java | |
parent | 6e71c954faff34b78a2952436b4f48d84a8c20cd (diff) | |
download | frameworks_base-2a935096db65857b32bcc5c1e1403cc65871a2a9.zip frameworks_base-2a935096db65857b32bcc5c1e1403cc65871a2a9.tar.gz frameworks_base-2a935096db65857b32bcc5c1e1403cc65871a2a9.tar.bz2 |
Don't spuriously time out restore sessions
If a restore set lookup took a long time, the client's restore
session could be declared timed out even though the client was
not at fault. Handle this properly by resetting the timeout clock
when control of the session is returned to the client.
Bug 3477324
Change-Id: I43afaf1063e8e706ef16b70be77f9eeeea6a321f
Diffstat (limited to 'services/java')
-rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index c48f360..ea38fbb 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -379,6 +379,10 @@ class BackupManagerService extends IBackupManager.Stub { } } + // Done: reset the session timeout clock + removeMessages(MSG_RESTORE_TIMEOUT); + sendEmptyMessageDelayed(MSG_RESTORE_TIMEOUT, TIMEOUT_RESTORE_INTERVAL); + mWakelock.release(); } break; |