diff options
| author | 2017-05-03 13:55:49 +0000 | |
|---|---|---|
| committer | 2017-05-03 13:55:54 +0000 | |
| commit | 3eafb6e2c6e6239386af496e1e90a4435f0965df (patch) | |
| tree | e88262006c09807520051614b46580a2357e44c8 | |
| parent | b2484f225842dd90c920f5a6d435a60232897952 (diff) | |
| parent | 3b03673d23784fb30d5fdf11ed4fa6e1619bef0f (diff) | |
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 1b970e5656bd..dc2dfa8ff289 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -3868,9 +3868,14 @@ public class BackupManagerService { writeApkToBackup(mPackage, output); } + final boolean isSharedStorage = + mPackage.packageName.equals(SHARED_BACKUP_AGENT_PACKAGE); + final long timeout = isSharedStorage ? + TIMEOUT_SHARED_BACKUP_INTERVAL : TIMEOUT_FULL_BACKUP_INTERVAL; + if (DEBUG) Slog.d(TAG, "Calling doFullBackup() on " + mPackage.packageName); - prepareOperationTimeout(mToken, TIMEOUT_FULL_BACKUP_INTERVAL, - mTimeoutMonitor /* in parent class */, OP_TYPE_BACKUP_WAIT); + prepareOperationTimeout(mToken, timeout, mTimeoutMonitor /* in parent class */, + OP_TYPE_BACKUP_WAIT); mAgent.doFullBackup(mPipe, mQuota, mToken, mBackupManagerBinder); } catch (IOException e) { Slog.e(TAG, "Error running full backup for " + mPackage.packageName); @@ -7578,9 +7583,12 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF if (okay) { boolean agentSuccess = true; long toCopy = info.size; + final boolean isSharedStorage = pkg.equals(SHARED_BACKUP_AGENT_PACKAGE); + final long timeout = isSharedStorage ? + TIMEOUT_SHARED_BACKUP_INTERVAL : TIMEOUT_RESTORE_INTERVAL; final int token = generateToken(); try { - prepareOperationTimeout(token, TIMEOUT_RESTORE_INTERVAL, null, + prepareOperationTimeout(token, timeout, null, OP_TYPE_RESTORE_WAIT); if (FullBackup.OBB_TREE_TOKEN.equals(info.domain)) { if (DEBUG) Slog.d(TAG, "Restoring OBB file for " + pkg |