From 1427b33d8b4a12cb5dfbd09229445e916e0cd9ea Mon Sep 17 00:00:00 2001 From: Cheney Ni Date: Wed, 27 Nov 2019 07:48:35 +0000 Subject: [PATCH] Revert "Do not use hidden noteOpNoThrow" This reverts commit 2290df315563c8a784c10b4e7b12c15c20fcc5ca. Bug: 145257921 Reason for revert: Droidcop-triggered revert due to breakage, bug 145257921. Change-Id: I95a27179083dbfbf5b3453ef3b45174f91594340 --- .../java/android/telephony/LocationAccessPolicy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/LocationAccessPolicy.java b/telephony/java/android/telephony/LocationAccessPolicy.java index e9837d555416c..79b375675588d 100644 --- a/telephony/java/android/telephony/LocationAccessPolicy.java +++ b/telephony/java/android/telephony/LocationAccessPolicy.java @@ -206,8 +206,8 @@ public final class LocationAccessPolicy { if (hasManifestPermission) { // Only check the app op if the app has the permission. int appOpMode = context.getSystemService(AppOpsManager.class) - .noteOpNoThrow(permissionToCheck, query.callingUid, query.callingPackage, - query.callingFeatureId, null); + .noteOpNoThrow(AppOpsManager.permissionToOpCode(permissionToCheck), + query.callingUid, query.callingPackage, query.callingFeatureId, null); if (appOpMode == AppOpsManager.MODE_ALLOWED) { // If the app did everything right, return without logging. return LocationPermissionResult.ALLOWED; @@ -265,7 +265,7 @@ public final class LocationAccessPolicy { // Do the check for fine, then for coarse. if (query.minSdkVersionForFine < Integer.MAX_VALUE) { LocationPermissionResult resultForFine = checkAppLocationPermissionHelper( - context, query, AppOpsManager.OPSTR_FINE_LOCATION); + context, query, Manifest.permission.ACCESS_FINE_LOCATION); if (resultForFine != null) { return resultForFine; } @@ -273,7 +273,7 @@ public final class LocationAccessPolicy { if (query.minSdkVersionForCoarse < Integer.MAX_VALUE) { LocationPermissionResult resultForCoarse = checkAppLocationPermissionHelper( - context, query, AppOpsManager.OPSTR_COARSE_LOCATION); + context, query, Manifest.permission.ACCESS_COARSE_LOCATION); if (resultForCoarse != null) { return resultForCoarse; }