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

Commit 400ea882 authored by Michael Wright's avatar Michael Wright
Browse files

Use correct contains method in PermissionManagerService. 

Hashtable#contains(String) is actually pre-generics method that maps to
Hashtable#containsValue(V). In this case, PermissionManagerService
actually wants to know if it contains a given key as the values in the
map are not Strings at all.

Bug: 217923092
Test: errorprone build
Change-Id: I1f315d1051aaab3831eaca34e12fc9858ee9aeda
parent 5c97595a

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
@@ -1318,7 +1318,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