Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9739c5 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

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

Merge commit '11bea2e2' into froyo-plus-aosp

* commit '11bea2e2':
  Reduce lock contention, removing unnecessary synchronization.
parents 66fa5cc7 11bea2e2

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;

    }