Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BackupManagerMonitor wrapping in RestoreSession

Browse Source 
Do not wrap a null monitor, pass a null wrapper instead.
BackupManagerService expects null monitor wrapper, so this
will prevent extra work for BMS and potential NPEs.

Bug: 36470662
Test: manual
Change-Id: Ia45375049101f757542960bc7f1fd640fc9c3fb7
This commit is contained in:
Anton Philippov
2017-03-29 16:00:32 +01:00
parent 92b3242827
commit 68faa93ce9
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/app/backup/RestoreSession.java
View File

@@ -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) {