diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-20 19:14:20 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-20 19:14:20 -0400 |
| commit | 8d9ddbe2aa3db86237880102ccf320945e7f57d3 (patch) | |
| tree | cc224b8f4b3c9ca560d09c64a08cf4903bfb9170 /services | |
| parent | 5b48223d0e8b8becea0c120895d964e6472b3552 (diff) | |
| parent | 9bbcb916c56371d2aee1dc4a6afc17d4ea9a83e0 (diff) | |
| download | frameworks_base-8d9ddbe2aa3db86237880102ccf320945e7f57d3.zip frameworks_base-8d9ddbe2aa3db86237880102ccf320945e7f57d3.tar.gz frameworks_base-8d9ddbe2aa3db86237880102ccf320945e7f57d3.tar.bz2 | |
Merge change I1f30f3f1 into eclair
* changes:
Fix #2201615: getCallingPackage returns calling process instead of calling package
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
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 e1e8bea..ad1926e 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; } } |