diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-10-22 06:38:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-22 06:38:50 -0700 |
| commit | 7fad4ee736b8a64c1acac7a9b40384f68562b664 (patch) | |
| tree | fc9d27f07ecabe170e63447b16dcc2e920f81b19 /services | |
| parent | 6d924c69af055559ed84afaf487aa38bd6fd2e33 (diff) | |
| parent | 8d9ddbe2aa3db86237880102ccf320945e7f57d3 (diff) | |
| download | frameworks_base-7fad4ee736b8a64c1acac7a9b40384f68562b664.zip frameworks_base-7fad4ee736b8a64c1acac7a9b40384f68562b664.tar.gz frameworks_base-7fad4ee736b8a64c1acac7a9b40384f68562b664.tar.bz2 | |
am 8d9ddbe2: Merge change I1f30f3f1 into eclair
Merge commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3' into eclair-mr2
* commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3':
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; } } |