Don't NPE if a restore session is requested for an invalid transport

2009-07-13 15:17:13 -07:00
parent 9ba6998b0b
commit 433830452d
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -1490,7 +1490,9 @@ class BackupManagerService extends IBackupManager.Stub {

            try {
            synchronized(this) {
-                if (mRestoreSets == null) {
+                if (mRestoreTransport == null) {
+                    Log.w(TAG, "Null transport getting restore sets");
+                } else if (mRestoreSets == null) { // valid transport; do the one-time fetch
                    mRestoreSets = mRestoreTransport.getAvailableRestoreSets();
                }
                return mRestoreSets;