am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread

* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
This commit is contained in:
Dianne Hackborn
2011-01-09 13:56:07 -08:00
committed by Android Git Automerger

View File

@@ -9266,7 +9266,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// r.record is null if findServiceLocked() failed the caller permission check // r.record is null if findServiceLocked() failed the caller permission check
if (r.record == null) { if (r.record == null) {
throw new SecurityException( throw new SecurityException(
"Permission Denial: Accessing service " + r.record.name "Permission Denial: Accessing service "
+ " from pid=" + Binder.getCallingPid() + " from pid=" + Binder.getCallingPid()
+ ", uid=" + Binder.getCallingUid() + ", uid=" + Binder.getCallingUid()
+ " requires " + r.permission); + " requires " + r.permission);