Merge change I1f30f3f1 into eclair

* changes: Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-20 19:14:20 -04:00
parent 5b48223d0e 9bbcb916c5
commit 8d9ddbe2aa
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -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;
        }
    }