am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1

* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30': Don't spuriously time out restore sessions
2011-03-04 00:16:27 -08:00
parent d8b243fea2 87ed42d065
commit 0474407e5d
1 changed files with 4 additions and 0 deletions
--- 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;