am ad2be762: Merge "Fix null pointer dereference when security exception occurs"

* commit 'ad2be762f2f0ff9f3c01e729e307920cef6e2904':
  Fix null pointer dereference when security exception occurs
This commit is contained in:
Olawale Ogunwale
2015-06-01 14:59:15 +00:00
committed by Android Git Automerger

View File

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