diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-23 14:15:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-23 14:15:45 -0700 |
| commit | 045398e6243fa4e83fb6435df4e8ffc6a7487a70 (patch) | |
| tree | 350f47f38b2d20d8ae288ea7303e17116ff89a86 /services | |
| parent | 37cedce14bc0e68e8bf27c2cecb181728226e6ed (diff) | |
| parent | 0674069aa4fb75064d4617466cb625699c44e04d (diff) | |
| download | frameworks_base-045398e6243fa4e83fb6435df4e8ffc6a7487a70.zip frameworks_base-045398e6243fa4e83fb6435df4e8ffc6a7487a70.tar.gz frameworks_base-045398e6243fa4e83fb6435df4e8ffc6a7487a70.tar.bz2 | |
Merge "Fix a deadlock I ran into." into gingerbread
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 4f0d2d5..3edf196 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -9621,20 +9621,20 @@ public final class ActivityManagerService extends ActivityManagerNative Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!"); return; } + } - long oldIdent = Binder.clearCallingIdentity(); - try { - IBackupManager bm = IBackupManager.Stub.asInterface( - ServiceManager.getService(Context.BACKUP_SERVICE)); - bm.agentConnected(agentPackageName, agent); - } catch (RemoteException e) { - // can't happen; the backup manager service is local - } catch (Exception e) { - Slog.w(TAG, "Exception trying to deliver BackupAgent binding: "); - e.printStackTrace(); - } finally { - Binder.restoreCallingIdentity(oldIdent); - } + long oldIdent = Binder.clearCallingIdentity(); + try { + IBackupManager bm = IBackupManager.Stub.asInterface( + ServiceManager.getService(Context.BACKUP_SERVICE)); + bm.agentConnected(agentPackageName, agent); + } catch (RemoteException e) { + // can't happen; the backup manager service is local + } catch (Exception e) { + Slog.w(TAG, "Exception trying to deliver BackupAgent binding: "); + e.printStackTrace(); + } finally { + Binder.restoreCallingIdentity(oldIdent); } } |