commit ff870651aba1134dde5978931b8061f9804253e6
author Nathan Harold <nharold@google.com> Fri Sep 25 05:48:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 25 05:48:14 2020 +0000
tree 8bf12b3673597a3cda6e565d7c8ff807453edf8a
parent e5c9073576faa5a70a57fb286cd2e2c6bc12cd1c
parent 38513f9f60bf4cd313c1910b9e09361c4413f16e

Merge "Allow Location-off NetworkScan without READ_PRIV" into rvc-qpr-dev am: 73942bf81b am: 38513f9f60

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12664548

Change-Id: I1d4cf323c6947705b6282fa8cb9431de62024d30

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f7344d8..9ce4f96 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5549,7 +5549,8 @@
                                 .setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q)
                                 .build());
         if (locationResult != LocationAccessPolicy.LocationPermissionResult.ALLOWED) {
-            SecurityException e = checkNetworkRequestForSanitizedLocationAccess(request, subId);
+            SecurityException e = checkNetworkRequestForSanitizedLocationAccess(
+                    request, subId, callingPackage);
             if (e != null) {
                 if (locationResult == LocationAccessPolicy.LocationPermissionResult.DENIED_HARD) {
                     throw e;
@@ -5572,8 +5573,8 @@
     }
 
     private SecurityException checkNetworkRequestForSanitizedLocationAccess(
-            NetworkScanRequest request, int subId) {
-        boolean hasCarrierPriv = getCarrierPrivilegeStatusForUid(subId, Binder.getCallingUid())
+            NetworkScanRequest request, int subId, String callingPackage) {
+        boolean hasCarrierPriv = checkCarrierPrivilegesForPackage(subId, callingPackage)
                 == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
         boolean hasNetworkScanPermission =
                 mApp.checkCallingOrSelfPermission(android.Manifest.permission.NETWORK_SCAN)