diff options
| author | 2022-02-04 20:45:04 +0000 | |
|---|---|---|
| committer | 2022-02-04 21:17:09 +0000 | |
| commit | 400ea8828105f6ce564fa48434ecf5116cf68f93 (patch) | |
| tree | 07149ebbea67cba4af3cf27a4448fafc285a05a2 | |
| parent | 5c97595aafa51cd11c609afe31a848f20cf908ee (diff) | |
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
| -rw-r--r-- | services/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerService.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/Android.bp b/services/Android.bp index 378ad540844f..654e8d05d713 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 edc0e3d64c42..d0bbe3d04bdb 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 |