Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Idfa47b56

Browse Source 
* changes:
  Don't crash the system process when a backup transport unregisters
This commit is contained in:
Android (Google) Code Review
2009-12-23 11:40:14 -08:00
parent 1905530bb1 dfa47b56e1
commit ea84a5559f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/BackupManagerService.java
View File

@@ -497,11 +497,21 @@ class BackupManagerService extends IBackupManager.Stub {
}
}
// Add a transport to our set of available backends
// Add a transport to our set of available backends. If 'transport' is null, this
// is an unregistration, and the transport's entry is removed from our bookkeeping.
private void registerTransport(String name, IBackupTransport transport) {
synchronized (mTransports) {
if (DEBUG) Log.v(TAG, "Registering transport " + name + " = " + transport);
mTransports.put(name, transport);
if (transport != null) {
mTransports.put(name, transport);
} else {
mTransports.remove(name);
if (mCurrentTransport.equals(name)) {
mCurrentTransport = null;
}
// Nothing further to do in the unregistration case
return;
}
}
// If the init sentinel file exists, we need to be sure to perform the init