commit 0db9724b6cfe4d13d54d0552345d2fc3b0aa4002
author Michal Karpinski <mkarpinski@google.com> Fri Apr 21 12:20:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 12:21:02 2017 +0000
tree 6a9f57b1d78929b64c67ac5b22a739e18fe7525e
parent 924d482a4467318a8ba42c2b928fef9cb9ca1f85
parent e42c8416b0262e4fcda8c03428194a6a0b699d00

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

services/backup/java/com/android/server/backup/Trampoline.java

diff --git a/services/backup/java/com/android/server/backup/Trampoline.java b/services/backup/java/com/android/server/backup/Trampoline.java
index a109e631..2c14a7c 100644
--- a/services/backup/java/com/android/server/backup/Trampoline.java
+++ b/services/backup/java/com/android/server/backup/Trampoline.java
@@ -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 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