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

am bb9739c5: am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo

Browse Source 
Merge commit 'bb9739c5d74404b9155565f2a08509079b719a22' into kraken

* commit 'bb9739c5d74404b9155565f2a08509079b719a22':
  Reduce lock contention, removing unnecessary synchronization.
This commit is contained in:
Brad Fitzpatrick
2010-04-19 12:23:58 -07:00
committed by Android Git Automerger
parent e5afb10cca bb9739c5d7
commit eb82845977
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6141,12 +6141,10 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (!(pendingResult instanceof PendingIntentRecord)) { if (!(pendingResult instanceof PendingIntentRecord)) {
return null; return null;
} }
synchronized(this) { try {
try { PendingIntentRecord res = (PendingIntentRecord)pendingResult;
PendingIntentRecord res = (PendingIntentRecord)pendingResult; return res.key.packageName;
return res.key.packageName; } catch (ClassCastException e) {
} catch (ClassCastException e) {
}
} }
return null; return null;
} }