From b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Fri, 29 Jan 2010 16:27:04 -0800 Subject: [PATCH] Don't crash on transport unregistration if there is no current transport Change-Id: Icd0962254ba224a7be27d408dffb25b634f67863 --- services/java/com/android/server/BackupManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index ee68a50b5321f..62dcb0878f257 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -641,7 +641,7 @@ class BackupManagerService extends IBackupManager.Stub { 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