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

Commit 4353b0b0 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Use correct contains method in PermissionManagerService."

parents dda94e8f 400ea882

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ java_defaults { 
            "-Xep:SelfEquals:ERROR",

            "-Xep:NullTernary:ERROR",

            "-Xep:TryFailThrowable:ERROR",

            "-Xep:HashtableContains:ERROR",

            // NOTE: only enable to generate local patchfiles

            // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",

            // "-XepPatchLocation:/tmp/refaster/",

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


                if (op < 0) {

                    // Bg location is one-off runtime modifier permission and has no app op

                    if (sPlatformPermissions.contains(permission)

                    if (sPlatformPermissions.containsKey(permission)

                            && !Manifest.permission.ACCESS_BACKGROUND_LOCATION.equals(permission)

                            && !Manifest.permission.BODY_SENSORS_BACKGROUND.equals(permission)) {

                        Slog.wtf(LOG_TAG, "Platform runtime permission " + permission