Merge "Reduce lock contention, removing unnecessary synchronization." into froyo

This commit is contained in:
Brad Fitzpatrick
2010-04-19 12:17:48 -07:00
committed by Android (Google) Code Review

View File

@@ -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;
}