am 7fad4ee7: am 8d9ddbe2: Merge change I1f30f3f1 into eclair

Merge commit '7fad4ee736b8a64c1acac7a9b40384f68562b664' into eclair-mr2-plus-aosp

* commit '7fad4ee736b8a64c1acac7a9b40384f68562b664':
  Fix #2201615: getCallingPackage returns calling process instead of calling package
This commit is contained in:
Dianne Hackborn
2009-10-22 06:45:38 -07:00
committed by Android Git Automerger

View File

@@ -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;
}
}