diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-11 18:36:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 18:36:34 -0700 |
| commit | 8773a5c52e5ecacbf132ea3e3e6de2e7dfb3492b (patch) | |
| tree | 8ef92ba6751d89911ac364453eff762e99a48f5b /services/java | |
| parent | b735e1d426d65007011a3d915ea8e2cdd0002ecb (diff) | |
| parent | 26c702c395fbbd833c2ae8d155ed4605b36c5472 (diff) | |
| download | frameworks_base-8773a5c52e5ecacbf132ea3e3e6de2e7dfb3492b.zip frameworks_base-8773a5c52e5ecacbf132ea3e3e6de2e7dfb3492b.tar.gz frameworks_base-8773a5c52e5ecacbf132ea3e3e6de2e7dfb3492b.tar.bz2 | |
am 26c702c3: am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev
* commit '26c702c395fbbd833c2ae8d155ed4605b36c5472':
Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...
Diffstat (limited to 'services/java')
| -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 ef16a0d..c6b3648 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -4581,7 +4581,7 @@ public final class ActivityManagerService extends ActivityManagerNative public String getCallingPackage(IBinder token) { synchronized (this) { ActivityRecord r = getCallingRecordLocked(token); - return r != null && r.app != null ? r.info.packageName : null; + return r != null ? r.info.packageName : null; } } |