Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37938cfc authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 995846a4: am d147203b: am ad2be762: Merge "Fix null pointer dereference... 

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

* commit '995846a4':
  Fix null pointer dereference when security exception occurs
parents 3ec7b82b 995846a4

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -518,7 +518,7 @@ public final class ActiveServices { 
            // 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);