diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-09 13:53:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-09 13:53:53 -0800 |
| commit | 9aac2e2b9541c424ca02483631b08949f0e90c8c (patch) | |
| tree | cf50b61603e899d522cadbe6f7c7f55d2cb7b3a6 /services | |
| parent | bbff7ed44b353ff299b900a1ff50812a082206f0 (diff) | |
| parent | c712204d91cc961c78c12e99b22fe5f3b60e9989 (diff) | |
| download | frameworks_base-9aac2e2b9541c424ca02483631b08949f0e90c8c.zip frameworks_base-9aac2e2b9541c424ca02483631b08949f0e90c8c.tar.gz frameworks_base-9aac2e2b9541c424ca02483631b08949f0e90c8c.tar.bz2 | |
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
Diffstat (limited to 'services')
| -rwxr-xr-x[-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 4781020..ddd99f4 100644..100755 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -9239,7 +9239,7 @@ public final class ActivityManagerService extends ActivityManagerNative // r.record is null if findServiceLocked() failed the caller permission check if (r.record == null) { throw new SecurityException( - "Permission Denial: Accessing service " + r.record.name + "Permission Denial: Accessing service " + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + " requires " + r.permission); |