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

Commit 7fad4ee7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 8d9ddbe2: Merge change I1f30f3f1 into eclair 

Merge commit '8d9ddbe2' into eclair-mr2

* commit '8d9ddbe2':
  Fix #2201615: getCallingPackage returns calling process instead of calling package
parents 6d924c69 8d9ddbe2

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

+1 −1
Original line number Diff line number Diff line
@@ -5742,7 +5742,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
    public String getCallingPackage(IBinder token) {

        synchronized (this) {

            HistoryRecord r = getCallingRecordLocked(token);

            return r != null && r.app != null ? r.app.processName : null;

            return r != null && r.app != null ? r.info.packageName : null;

        }

    }