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

2010-04-19 12:36:01 -07:00
parent 4ead13caa3 eb82845977
commit c322f51f8c
1 changed files with 4 additions and 6 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6141,12 +6141,10 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
        if (!(pendingResult instanceof PendingIntentRecord)) {
            return null;
        }
-        synchronized(this) {
-            try {
-                PendingIntentRecord res = (PendingIntentRecord)pendingResult;
-                return res.key.packageName;
-            } catch (ClassCastException e) {
-            }
+        try {
+            PendingIntentRecord res = (PendingIntentRecord)pendingResult;
+            return res.key.packageName;
+        } catch (ClassCastException e) {
        }
        return null;
    }