Merge "Get blocked restore keys directly from UserBMS" (88cb2d9d) · Commits · e / os / android_frameworks_base

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

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1080,12 +1080,8 @@ public class UserBackupManagerService {
	}		}
	}		}

	public Map<String, Set<String>> getExcludedRestoreKeys(String... packages) {		public Set<String> getExcludedRestoreKeys(String packageName) {
	return mBackupPreferences.getExcludedRestoreKeysForPackages(packages);		return mBackupPreferences.getExcludedRestoreKeysForPackage(packageName);
	}

	public Map<String, Set<String>> getAllExcludedRestoreKeys() {
	return mBackupPreferences.getAllExcludedRestoreKeys();
	}		}

	/** Used for generating random salts or passwords. */		/** Used for generating random salts or passwords. */
	@@ -3356,8 +3352,7 @@ public class UserBackupManagerService {
	restoreSet,		restoreSet,
	packageName,		packageName,
	token,		token,
	listener,		listener);
	getExcludedRestoreKeys(packageName));
	mBackupHandler.sendMessage(msg);		mBackupHandler.sendMessage(msg);
	} catch (Exception e) {		} catch (Exception e) {
	// Calling into the transport broke; back off and proceed with the installation.		// Calling into the transport broke; back off and proceed with the installation.

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

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -48,16 +48,7 @@ public class UserBackupPreferences {
	mEditor.commit();		mEditor.commit();
	}		}

	Map<String, Set<String>> getExcludedRestoreKeysForPackages(String... packages) {		Set<String> getExcludedRestoreKeysForPackage(String packageName) {
	Map<String, Set<String>> excludedKeys = new HashMap<>();		return mPreferences.getStringSet(packageName, Collections.emptySet());
	for (String packageName : packages) {
	excludedKeys.put(packageName,
	mPreferences.getStringSet(packageName, Collections.emptySet()));
	}
	return excludedKeys;
	}

	Map<String, Set<String>> getAllExcludedRestoreKeys() {
	return (Map<String, Set<String>>) mPreferences.getAll();
	}		}
	}		}

services/backup/java/com/android/server/backup/internal/BackupHandler.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -299,8 +299,7 @@ public class BackupHandler extends Handler {
	params.pmToken,		params.pmToken,
	params.isSystemRestore,		params.isSystemRestore,
	params.filterSet,		params.filterSet,
	params.listener,		params.listener);
	params.excludedKeys);

	synchronized (backupManagerService.getPendingRestores()) {		synchronized (backupManagerService.getPendingRestores()) {
	if (backupManagerService.isRestoreInProgress()) {		if (backupManagerService.isRestoreInProgress()) {

services/backup/java/com/android/server/backup/params/RestoreParams.java

+9 −20

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,6 @@ public class RestoreParams {
	public final boolean isSystemRestore;		public final boolean isSystemRestore;
	@Nullable public final String[] filterSet;		@Nullable public final String[] filterSet;
	public final OnTaskFinishedListener listener;		public final OnTaskFinishedListener listener;
	public final Map<String, Set<String>> excludedKeys;

	/**		/**
	* No kill after restore.		* No kill after restore.
	@@ -48,8 +47,7 @@ public class RestoreParams {
	IBackupManagerMonitor monitor,		IBackupManagerMonitor monitor,
	long token,		long token,
	PackageInfo packageInfo,		PackageInfo packageInfo,
	OnTaskFinishedListener listener,		OnTaskFinishedListener listener) {
	Map<String, Set<String>> excludedKeys) {
	return new RestoreParams(		return new RestoreParams(
	transportClient,		transportClient,
	observer,		observer,
	@@ -59,8 +57,7 @@ public class RestoreParams {
	/* pmToken */ 0,		/* pmToken */ 0,
	/* isSystemRestore */ false,		/* isSystemRestore */ false,
	/* filterSet */ null,		/* filterSet */ null,
	listener,		listener);
	excludedKeys);
	}		}

	/**		/**
	@@ -73,8 +70,7 @@ public class RestoreParams {
	long token,		long token,
	String packageName,		String packageName,
	int pmToken,		int pmToken,
	OnTaskFinishedListener listener,		OnTaskFinishedListener listener) {
	Map<String, Set<String>> excludedKeys) {
	String[] filterSet = {packageName};		String[] filterSet = {packageName};
	return new RestoreParams(		return new RestoreParams(
	transportClient,		transportClient,
	@@ -85,8 +81,7 @@ public class RestoreParams {
	pmToken,		pmToken,
	/* isSystemRestore */ false,		/* isSystemRestore */ false,
	filterSet,		filterSet,
	listener,		listener);
	excludedKeys);
	}		}

	/**		/**
	@@ -97,8 +92,7 @@ public class RestoreParams {
	IRestoreObserver observer,		IRestoreObserver observer,
	IBackupManagerMonitor monitor,		IBackupManagerMonitor monitor,
	long token,		long token,
	OnTaskFinishedListener listener,		OnTaskFinishedListener listener) {
	Map<String, Set<String>> excludedKeys) {
	return new RestoreParams(		return new RestoreParams(
	transportClient,		transportClient,
	observer,		observer,
	@@ -108,8 +102,7 @@ public class RestoreParams {
	/* pmToken */ 0,		/* pmToken */ 0,
	/* isSystemRestore */ true,		/* isSystemRestore */ true,
	/* filterSet */ null,		/* filterSet */ null,
	listener,		listener);
	excludedKeys);
	}		}

	/**		/**
	@@ -122,8 +115,7 @@ public class RestoreParams {
	long token,		long token,
	String[] filterSet,		String[] filterSet,
	boolean isSystemRestore,		boolean isSystemRestore,
	OnTaskFinishedListener listener,		OnTaskFinishedListener listener) {
	Map<String, Set<String>> excludedKeys) {
	return new RestoreParams(		return new RestoreParams(
	transportClient,		transportClient,
	observer,		observer,
	@@ -133,8 +125,7 @@ public class RestoreParams {
	/* pmToken */ 0,		/* pmToken */ 0,
	isSystemRestore,		isSystemRestore,
	filterSet,		filterSet,
	listener,		listener);
	excludedKeys);
	}		}

	private RestoreParams(		private RestoreParams(
	@@ -146,8 +137,7 @@ public class RestoreParams {
	int pmToken,		int pmToken,
	boolean isSystemRestore,		boolean isSystemRestore,
	@Nullable String[] filterSet,		@Nullable String[] filterSet,
	OnTaskFinishedListener listener,		OnTaskFinishedListener listener) {
	Map<String, Set<String>> excludedKeys) {
	this.transportClient = transportClient;		this.transportClient = transportClient;
	this.observer = observer;		this.observer = observer;
	this.monitor = monitor;		this.monitor = monitor;
	@@ -157,6 +147,5 @@ public class RestoreParams {
	this.isSystemRestore = isSystemRestore;		this.isSystemRestore = isSystemRestore;
	this.filterSet = filterSet;		this.filterSet = filterSet;
	this.listener = listener;		this.listener = listener;
	this.excludedKeys = excludedKeys;
	}		}
	}		}

services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -178,8 +178,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub {
	observer,		observer,
	monitor,		monitor,
	token,		token,
	listener,		listener),
	mBackupManagerService.getAllExcludedRestoreKeys()),
	"RestoreSession.restoreAll()");		"RestoreSession.restoreAll()");
	} finally {		} finally {
	Binder.restoreCallingIdentity(oldId);		Binder.restoreCallingIdentity(oldId);
	@@ -272,8 +271,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub {
	token,		token,
	packages,		packages,
	/* isSystemRestore */ packages.length > 1,		/* isSystemRestore */ packages.length > 1,
	listener,		listener),
	mBackupManagerService.getExcludedRestoreKeys(packages)),
	"RestoreSession.restorePackages(" + packages.length + " packages)");		"RestoreSession.restorePackages(" + packages.length + " packages)");
	} finally {		} finally {
	Binder.restoreCallingIdentity(oldId);		Binder.restoreCallingIdentity(oldId);
	@@ -365,8 +363,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub {
	monitor,		monitor,
	token,		token,
	app,		app,
	listener,		listener),
	mBackupManagerService.getExcludedRestoreKeys(app.packageName)),
	"RestoreSession.restorePackage(" + packageName + ")");		"RestoreSession.restorePackage(" + packageName + ")");
	} finally {		} finally {
	Binder.restoreCallingIdentity(oldId);		Binder.restoreCallingIdentity(oldId);