summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-10-06 22:59:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-06 22:59:16 +0000
commitd29e0cdfd0d365a934c922a3c7376e389d40c0ad (patch)
tree4006c6cba98704b4246ca60488cd358931c23981
parent469e0a802f0fbac83967cbf4f66954ee3447392d (diff)
parent886d034fb269a0f56c560c6a12b036a55cb57727 (diff)
Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev am: 886d034fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994552 Change-Id: I3d4b63f97b300a55f1e0055bafa908ea76a17d74
-rw-r--r--services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java b/services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java
index a47c48fa16d4..2df21017156d 100644
--- a/services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java
+++ b/services/core/java/com/android/server/location/injector/LocationPermissionsHelper.java
@@ -100,7 +100,7 @@ public abstract class LocationPermissionsHelper {
return false;
}
- return mAppOps.checkOpNoThrow(permissionLevel, identity);
+ return mAppOps.checkOpNoThrow(LocationPermissions.asAppOp(permissionLevel), identity);
}
protected abstract boolean hasPermission(String permission, CallerIdentity callerIdentity);