Merge "Prevent construction/use of invalid restore session proxies" into jb-dev (aefe4aa4) · Commits · e / os / android_frameworks_base

core/java/android/app/backup/BackupManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -145,8 +145,10 @@ public class BackupManager {
		try {
		IRestoreSession binder = sService.beginRestoreSession(mContext.getPackageName(),
		null);
		if (binder != null) {
		session = new RestoreSession(mContext, binder);
		result = session.restorePackage(mContext.getPackageName(), observer);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "restoreSelf() unable to contact service");
		} finally {
		@@ -170,7 +172,9 @@ public class BackupManager {
		try {
		// All packages, current transport
		IRestoreSession binder = sService.beginRestoreSession(null, null);
		if (binder != null) {
		session = new RestoreSession(mContext, binder);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "beginRestoreSession() couldn't connect");
		}