diff --git a/services/Android.bp b/services/Android.bp index 378ad540844f3..654e8d05d7138 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -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/", diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index edc0e3d64c423..d0bbe3d04bdbb 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -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