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

am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread

Browse Source 
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp

* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
  Fix a deadlock I ran into.
This commit is contained in:
Dianne Hackborn
2010-09-23 14:17:54 -07:00
committed by Android Git Automerger
parent 9c70835896 045398e624
commit 2983e038d1
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -9645,20 +9645,20 @@ public final class ActivityManagerService extends ActivityManagerNative
Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!"); Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!");
return; return;
} }
}
long oldIdent = Binder.clearCallingIdentity(); long oldIdent = Binder.clearCallingIdentity();
try { try {
IBackupManager bm = IBackupManager.Stub.asInterface( IBackupManager bm = IBackupManager.Stub.asInterface(
ServiceManager.getService(Context.BACKUP_SERVICE)); ServiceManager.getService(Context.BACKUP_SERVICE));
bm.agentConnected(agentPackageName, agent); bm.agentConnected(agentPackageName, agent);
} catch (RemoteException e) { } catch (RemoteException e) {
// can't happen; the backup manager service is local // can't happen; the backup manager service is local
} catch (Exception e) { } catch (Exception e) {
Slog.w(TAG, "Exception trying to deliver BackupAgent binding: "); Slog.w(TAG, "Exception trying to deliver BackupAgent binding: ");
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
Binder.restoreCallingIdentity(oldIdent); Binder.restoreCallingIdentity(oldIdent);
}
} }
} }