diff options
author | Christopher Tate <ctate@google.com> | 2014-07-17 15:58:12 -0700 |
---|---|---|
committer | Christopher Tate <ctate@android.com> | 2014-07-17 23:01:04 +0000 |
commit | 5f7f252b451f94bc09e2e5b880e026c28a9c2d0b (patch) | |
tree | b662685b871bdf63deb2117cd3d53e6aa70e9509 /services | |
parent | f3e85b5bac693780c75935f0d27acf536458702d (diff) | |
download | frameworks_base-5f7f252b451f94bc09e2e5b880e026c28a9c2d0b.zip frameworks_base-5f7f252b451f94bc09e2e5b880e026c28a9c2d0b.tar.gz frameworks_base-5f7f252b451f94bc09e2e5b880e026c28a9c2d0b.tar.bz2 |
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).
Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
Diffstat (limited to 'services')
-rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index f54f798..ce9e85e 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -7037,6 +7037,7 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF // handling will deal properly with that. Slog.e(TAG, "Error " + result + " streaming restore for " + mCurrentPackage.packageName); + status = result; } } if (MORE_DEBUG) Slog.v(TAG, "Done copying to engine, falling through"); |