Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cecad7b authored by Anton Philippov's avatar Anton Philippov Committed by android-build-merger
Browse files

Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev 

am: 537fd18e

Change-Id: I7d83249d341d150d3cdd3aad9b784e6ef8a4b792
parents 9afea67c 537fd18e

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

+12 −5
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ public class RestoreSession { 
    public int getAvailableRestoreSets(RestoreObserver observer, BackupManagerMonitor monitor) {

        int err = -1;

        RestoreObserverWrapper obsWrapper = new RestoreObserverWrapper(mContext, observer);

        BackupManagerMonitorWrapper monitorWrapper = new BackupManagerMonitorWrapper(monitor);

        BackupManagerMonitorWrapper monitorWrapper = monitor == null

                ? null

                : new BackupManagerMonitorWrapper(monitor);

        try {

            err = mBinder.getAvailableRestoreSets(obsWrapper, monitorWrapper);

        } catch (RemoteException e) {
@@ -99,7 +101,9 @@ public class RestoreSession { 
            return -1;

        }

        mObserver = new RestoreObserverWrapper(mContext, observer);

        BackupManagerMonitorWrapper monitorWrapper = new BackupManagerMonitorWrapper(monitor);

        BackupManagerMonitorWrapper monitorWrapper = monitor == null

                ? null

                : new BackupManagerMonitorWrapper(monitor);

        try {

            err = mBinder.restoreAll(token, mObserver, monitorWrapper);

        } catch (RemoteException e) {
@@ -154,7 +158,9 @@ public class RestoreSession { 
            return -1;

        }

        mObserver = new RestoreObserverWrapper(mContext, observer);

        BackupManagerMonitorWrapper monitorWrapper = new BackupManagerMonitorWrapper(monitor);

        BackupManagerMonitorWrapper monitorWrapper = monitor == null

                ? null

                : new BackupManagerMonitorWrapper(monitor);

        try {

            err = mBinder.restoreSome(token, mObserver, monitorWrapper, packages);

        } catch (RemoteException e) {
@@ -212,8 +218,9 @@ public class RestoreSession { 
            return -1;

        }

        mObserver = new RestoreObserverWrapper(mContext, observer);

        BackupManagerMonitorWrapper monitorWrapper = new BackupManagerMonitorWrapper(monitor);



        BackupManagerMonitorWrapper monitorWrapper = monitor == null

                ? null

                : new BackupManagerMonitorWrapper(monitor);

        try {

            err = mBinder.restorePackage(packageName, mObserver, monitorWrapper);

        } catch (RemoteException e) {