diff options
| author | Christopher Tate <ctate@google.com> | 2010-01-29 16:27:04 -0800 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2010-01-29 16:27:04 -0800 |
| commit | b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e (patch) | |
| tree | 9f724399126713699cd0ea14338c78ae3985aa6a /services/java/com/android/server/BackupManagerService.java | |
| parent | 239d5b3638ae486f715f44a8c1a71420f486049c (diff) | |
| download | frameworks_base-b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e.zip frameworks_base-b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e.tar.gz frameworks_base-b0dcaaf108d70040e4e4e4ac65df1a7eae732d1e.tar.bz2 | |
Don't crash on transport unregistration if there is no current transport
Change-Id: Icd0962254ba224a7be27d408dffb25b634f67863
Diffstat (limited to 'services/java/com/android/server/BackupManagerService.java')
| -rw-r--r-- | services/java/com/android/server/BackupManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 |