Merge "Fix null pointer dereference when security exception occurs"

2015-06-01 14:45:27 +00:00
parent 5ef5378374 a64cd48594
commit ad2be762f2
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -509,7 +509,7 @@ public final class ActiveServices {
            // 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);