commit b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e
author Christopher Tate <ctate@google.com> Fri Jan 29 16:27:04 2010 -0800
committer Christopher Tate <ctate@google.com> Fri Jan 29 16:27:04 2010 -0800
tree 9f724399126713699cd0ea14338c78ae3985aa6a
parent 239d5b3638ae486f715f44a8c1a71420f486049c

Don't crash on transport unregistration if there is no current transport

Change-Id: Icd0962254ba224a7be27d408dffb25b634f67863

services/java/com/android/server/BackupManagerService.java

diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index ee68a50b5..62dcb08 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -641,7 +641,7 @@
                 mTransports.put(name, transport);
             } else {
                 mTransports.remove(name);
-                if (mCurrentTransport.equals(name)) {
+                if ((mCurrentTransport != null) && mCurrentTransport.equals(name)) {
                     mCurrentTransport = null;
                 }
                 // Nothing further to do in the unregistration case