Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev

am: 9dee975361 Change-Id: I174fa48341337fa38e1edf40460f01a655fff62a
2017-05-04 08:50:01 +00:00
parent 0bf5c1227b 9dee975361
commit f35953a7ae
1 changed files with 8 additions and 0 deletions
--- a/services/backup/java/com/android/server/backup/Trampoline.java
+++ b/services/backup/java/com/android/server/backup/Trampoline.java
@@ -304,6 +304,14 @@ public class Trampoline extends IBackupManager.Stub {
        BackupManagerService svc = mService;
        if (svc != null) {
            svc.selectBackupTransportAsync(transport, listener);
+        } else {
+            if (listener != null) {
+                try {
+                    listener.onFailure(BackupManager.ERROR_BACKUP_NOT_ALLOWED);
+                } catch (RemoteException ex) {
+                    // Ignore
+                }
+            }
        }
    }