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

am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev

Browse Source 
* commit 'aefe4aa4d470d308f17a71b16bf1a0d58c79c05c':
  Prevent construction/use of invalid restore session proxies
This commit is contained in:
Christopher Tate
2012-05-29 15:57:34 -07:00
committed by Android Git Automerger
parent f3b4c93e0d aefe4aa4d4
commit 03ab4eb550
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/backup/BackupManager.java
View File

@@ -145,8 +145,10 @@ public class BackupManager {
try {
IRestoreSession binder = sService.beginRestoreSession(mContext.getPackageName(),
null);
session = new RestoreSession(mContext, binder);
result = session.restorePackage(mContext.getPackageName(), observer);
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);
session = new RestoreSession(mContext, binder);
if (binder != null) {
session = new RestoreSession(mContext, binder);
}
} catch (RemoteException e) {
Log.w(TAG, "beginRestoreSession() couldn't connect");
}