Merge changes from topic "api-review-restore-packages" (d0166415) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -924,8 +924,10 @@ package android.app.backup {
	method public int restoreAll(long, android.app.backup.RestoreObserver);		method public int restoreAll(long, android.app.backup.RestoreObserver);
	method public int restorePackage(String, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor);		method public int restorePackage(String, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor);
	method public int restorePackage(String, android.app.backup.RestoreObserver);		method public int restorePackage(String, android.app.backup.RestoreObserver);
	method public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);		method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>, @Nullable android.app.backup.BackupManagerMonitor);
	method public int restoreSome(long, android.app.backup.RestoreObserver, String[]);		method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>);
			method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);
			method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, String[]);
	}		}

	public class RestoreSet implements android.os.Parcelable {		public class RestoreSet implements android.os.Parcelable {

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -803,8 +803,8 @@ public class Bmgr {
	} else {		} else {
	String[] names = new String[filter.size()];		String[] names = new String[filter.size()];
	filter.toArray(names);		filter.toArray(names);
	didRestore = (mRestore.restoreSome(token, observer,		didRestore = (mRestore.restorePackages(token, observer, names,
	null, names) == 0);		null) == 0);
	}		}
	break;		break;
	}		}

core/java/android/app/backup/IRestoreSession.aidl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -71,8 +71,8 @@ interface IRestoreSession {
	* applications mentioned in this list will have their data restored.		* applications mentioned in this list will have their data restored.
	* @param monitor If non null the binder will send important events to this monitor.		* @param monitor If non null the binder will send important events to this monitor.
	*/		*/
	int restoreSome(long token, IRestoreObserver observer, IBackupManagerMonitor monitor,		int restorePackages(long token, IRestoreObserver observer, in String[] packages,
	in String[] packages);		IBackupManagerMonitor monitor);

	/**		/**
	* Restore a single application from backup. The data will be restored from the		* Restore a single application from backup. The data will be restored from the

core/java/android/app/backup/RestoreSession.java

+67 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package android.app.backup;		package android.app.backup;

			import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;
	@@ -24,6 +26,10 @@ import android.os.Message;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.util.Log;		import android.util.Log;

			import java.util.Arrays;
			import java.util.HashSet;
			import java.util.Set;

	/**		/**
	* Interface for managing a restore session.		* Interface for managing a restore session.
	* @hide		* @hide
	@@ -138,14 +144,15 @@ public class RestoreSession {
	* the restore set that should be used.		* the restore set that should be used.
	* @param observer If non-null, this binder points to an object that will receive		* @param observer If non-null, this binder points to an object that will receive
	* progress callbacks during the restore operation.		* progress callbacks during the restore operation.
	* @param monitor If non-null, this binder points to an object that will receive
	* progress callbacks during the restore operation.
	* @param packages The set of packages for which to attempt a restore. Regardless of		* @param packages The set of packages for which to attempt a restore. Regardless of
	* the contents of the actual back-end dataset named by {@code token}, only		* the contents of the actual back-end dataset named by {@code token}, only
	* applications mentioned in this list will have their data restored.		* applications mentioned in this list will have their data restored.
			* @param monitor If non-null, this binder points to an object that will receive
			* progress callbacks during the restore operation containing detailed information on any
			* failures or important decisions made by {@link BackupManager}.
	*/		*/
	public int restoreSome(long token, RestoreObserver observer, BackupManagerMonitor monitor,		public int restorePackages(long token, @Nullable RestoreObserver observer,
	String[] packages) {		@NonNull Set<String> packages, @Nullable BackupManagerMonitor monitor) {
	int err = -1;		int err = -1;
	if (mObserver != null) {		if (mObserver != null) {
	Log.d(TAG, "restoreAll() called during active restore");		Log.d(TAG, "restoreAll() called during active restore");
	@@ -156,7 +163,8 @@ public class RestoreSession {
	? null		? null
	: new BackupManagerMonitorWrapper(monitor);		: new BackupManagerMonitorWrapper(monitor);
	try {		try {
	err = mBinder.restoreSome(token, mObserver, monitorWrapper, packages);		err = mBinder.restorePackages(token, mObserver, packages.toArray(new String[] {}),
			monitorWrapper);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.d(TAG, "Can't contact server to restore packages");		Log.d(TAG, "Can't contact server to restore packages");
	}		}
	@@ -180,6 +188,60 @@ public class RestoreSession {
	* the contents of the actual back-end dataset named by {@code token}, only		* the contents of the actual back-end dataset named by {@code token}, only
	* applications mentioned in this list will have their data restored.		* applications mentioned in this list will have their data restored.
	*/		*/
			public int restorePackages(long token, @Nullable RestoreObserver observer,
			@NonNull Set<String> packages) {
			return restorePackages(token, observer, packages, null);
			}

			/**
			* Restore select packages from the given set onto the device, replacing the
			* current data of any app contained in the set with the data previously
			* backed up.
			*
			* <p>Callers must hold the android.permission.BACKUP permission to use this method.
			*
			* @return Zero on success, nonzero on error. The observer will only receive
			* progress callbacks if this method returned zero.
			* @param token The token from {@link getAvailableRestoreSets()} corresponding to
			* the restore set that should be used.
			* @param observer If non-null, this binder points to an object that will receive
			* progress callbacks during the restore operation.
			* @param monitor If non-null, this binder points to an object that will receive
			* progress callbacks during the restore operation.
			* @param packages The set of packages for which to attempt a restore. Regardless of
			* the contents of the actual back-end dataset named by {@code token}, only
			* applications mentioned in this list will have their data restored.
			*
			* @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver,
			* BackupManagerMonitor, Set)} instead.
			*/
			@Deprecated
			public int restoreSome(long token, RestoreObserver observer, BackupManagerMonitor monitor,
			String[] packages) {
			return restorePackages(token, observer, new HashSet<>(Arrays.asList(packages)), monitor);
			}

			/**
			* Restore select packages from the given set onto the device, replacing the
			* current data of any app contained in the set with the data previously
			* backed up.
			*
			* <p>Callers must hold the android.permission.BACKUP permission to use this method.
			*
			* @return Zero on success, nonzero on error. The observer will only receive
			* progress callbacks if this method returned zero.
			* @param token The token from {@link getAvailableRestoreSets()} corresponding to
			* the restore set that should be used.
			* @param observer If non-null, this binder points to an object that will receive
			* progress callbacks during the restore operation.
			* @param packages The set of packages for which to attempt a restore. Regardless of
			* the contents of the actual back-end dataset named by {@code token}, only
			* applications mentioned in this list will have their data restored.
			*
			* @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver, Set)}
			* instead.
			*/
			@Deprecated
	public int restoreSome(long token, RestoreObserver observer, String[] packages) {		public int restoreSome(long token, RestoreObserver observer, String[] packages) {
	return restoreSome(token, observer, null, packages);		return restoreSome(token, observer, null, packages);
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,7 @@ public class RestoreParams {
	/**		/**
	* Caller specifies whether is considered a system-level restore.		* Caller specifies whether is considered a system-level restore.
	*/		*/
	public static RestoreParams createForRestoreSome(		public static RestoreParams createForRestorePackages(
	TransportClient transportClient,		TransportClient transportClient,
	IRestoreObserver observer,		IRestoreObserver observer,
	IBackupManagerMonitor monitor,		IBackupManagerMonitor monitor,