Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev (cef0c6b5) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -6057,7 +6057,11 @@ public class BackupManagerService {
		// the app developer's cert, so they're different on every
		// device.
		if (signaturesMatch(sigs, pkgInfo)) {
		if (pkgInfo.versionCode >= version) {
		if ((pkgInfo.applicationInfo.flags
		& ApplicationInfo.FLAG_RESTORE_ANY_VERSION) != 0) {
		Slog.i(TAG, "Package has restoreAnyVersion; taking data");
		policy = RestorePolicy.ACCEPT;
		} else if (pkgInfo.versionCode >= version) {
		Slog.i(TAG, "Sig + version match; taking data");
		policy = RestorePolicy.ACCEPT;
		} else {
		@@ -7479,7 +7483,11 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
		// the app developer's cert, so they're different on every
		// device.
		if (signaturesMatch(sigs, pkgInfo)) {
		if (pkgInfo.versionCode >= version) {
		if ((pkgInfo.applicationInfo.flags
		& ApplicationInfo.FLAG_RESTORE_ANY_VERSION) != 0) {
		Slog.i(TAG, "Package has restoreAnyVersion; taking data");
		policy = RestorePolicy.ACCEPT;
		} else if (pkgInfo.versionCode >= version) {
		Slog.i(TAG, "Sig + version match; taking data");
		policy = RestorePolicy.ACCEPT;
		} else {