summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorlge-aosp <lge-aosp@lge.com>2011-01-07 13:45:37 +0900
committerDianne Hackborn <hackbod@google.com>2011-01-09 12:38:34 -0800
commitc712204d91cc961c78c12e99b22fe5f3b60e9989 (patch)
treef99c48759d9156afe546620b2ba6f1e0383547d1 /services/java
parent433863b1085248a8fdc9bcd0ac8501cc6a7b8ace (diff)
downloadframeworks_base-c712204d91cc961c78c12e99b22fe5f3b60e9989.zip
frameworks_base-c712204d91cc961c78c12e99b22fe5f3b60e9989.tar.gz
frameworks_base-c712204d91cc961c78c12e99b22fe5f3b60e9989.tar.bz2
Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I625e45923a7fd9f4ac8eb434ed07d452f8e1e0b6
Diffstat (limited to 'services/java')
-rwxr-xr-x[-rw-r--r--]services/java/com/android/server/am/ActivityManagerService.java2
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);