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

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;