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

Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev

Browse Source
This commit is contained in:
Michal Karpinski
2017-04-21 12:20:58 +00:00
committed by Android (Google) Code Review
parent 924d482a44 e42c8416b0
commit 0db9724b6c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/backup/java/com/android/server/backup/Trampoline.java
View File

@@ -16,6 +16,7 @@
package com.android.server.backup;
import android.app.backup.BackupManager;
import android.app.backup.IBackupManager;
import android.app.backup.IBackupObserver;
import android.app.backup.IBackupManagerMonitor;
@@ -361,7 +362,10 @@ public class Trampoline extends IBackupManager.Stub {
public int requestBackup(String[] packages, IBackupObserver observer,
IBackupManagerMonitor monitor, int flags) throws RemoteException {
BackupManagerService svc = mService;
return (svc != null) ? svc.requestBackup(packages, observer, monitor, flags) : null;
if (svc == null) {
return BackupManager.ERROR_BACKUP_NOT_ALLOWED;
}
return svc.requestBackup(packages, observer, monitor, flags);
}
@Override