Commit 08b30a39 authored Nov 26, 2014 by Ricardo Cerqueira Committed by Adnan Begovic Nov 28, 2014

BackupManagerService: Unbreak "adb restore"

The new restoreOneFile() logic aborts the loop whenever the result
isn't an actual successful restore. The problem is that a normal
backup will have plenty of non-restore cycles (APKs that are already
present being the most common), so this breaks regular "adb restore".

Go back to the original logic of completing the loop as long as the tar
file has data (or an explicit abort is generated)

Change-Id: I808cdc1c3b374e29d8438c7051e37c24a7a9d991

parent 3b184466

services/java/com/android/server/BackupManagerService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -3718,6 +3718,7 @@ class BackupManagerService extends IBackupManager.Stub {
		if (MORE_DEBUG) {
		Slog.w(TAG, "Dropping invalid path " + info.path);
		}
		result = RESULT_UNKNOWN_ERROR;
		okay = false;
		}

		@@ -3902,7 +3903,7 @@ class BackupManagerService extends IBackupManager.Stub {
		result = RESULT_UNKNOWN_ERROR;
		}

		return result;
		return (info == null) ? result : CONTINUE_RESTORE;
		}

		void setUpPipes() throws IOException {