Commit eb828459 authored Apr 19, 2010 by Brad Fitzpatrick Committed by Android Git Automerger Apr 19, 2010

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

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

Merge commit 'bb9739c5' into kraken

* commit 'bb9739c5':
  Reduce lock contention, removing unnecessary synchronization.

parents e5afb10c bb9739c5

services/java/com/android/server/am/ActivityManagerService.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -6141,13 +6141,11 @@ 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) {
		}
		}
		return null;
		}