diff options
| author | 2022-02-07 16:06:38 +0000 | |
|---|---|---|
| committer | 2022-02-07 16:06:38 +0000 | |
| commit | 4353b0b03fbe8f18cd1c994b95791c08a88e9848 (patch) | |
| tree | 2c5bac2952c217c47bfb51fe759e4afd6fdf25e3 | |
| parent | dda94e8f13569e6236958cec6e45072da11df2aa (diff) | |
| parent | 400ea8828105f6ce564fa48434ecf5116cf68f93 (diff) | |
Merge "Use correct contains method in PermissionManagerService."
| -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 134218b5c724..4e7e3c1ed4d1 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 695d6dd0bc76..698068dd8091 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -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 |