Merge change I1f30f3f1 into eclair

* changes:
  Fix #2201615: getCallingPackage returns calling process instead of calling package

1 files changed, 1 insertions, 1 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index e1e8beae7dd2..ad1926e20aa6 100644
--- 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;
         }
     }