commit 284aa0404e40e3292ca30de4a223b3bb4f2ba509
author Nathan Harold <nharold@google.com> Tue Sep 22 17:54:53 2020 -0700
committer Nathan Harold <nharold@google.com> Wed Oct 21 13:10:12 2020 -0700
tree 7bd0248785fc0a2ce27555106d613a5c971f49b7
parent 3f09c7a3d0055480b5839dc95156214bc0d1df0e

Allow Location-off NetworkScan without READ_PRIV

There is a bug that was failing to perform the carrier
privileges permissions check unless the caller had
READ_PRIVILEGED_PHONE_STATE. Update the check to use
a different method for verifying carrier privileges that
doesn't require READ_PRIVILEGED_PHONE_STATE as a prereq.

Bug: 169022494
Test: ag/12690432
Merged-In: Ia8779004e98f63c1fca82fa6d3ccffb445d9fde9
Change-Id: Ia8779004e98f63c1fca82fa6d3ccffb445d9fde9
(cherry picked from commit 1c11dba2c18b5c25900e3c55c9a9cecf81fac229)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a28130d..9e97145 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5406,7 +5406,8 @@
                                 .setMinSdkVersionForFine(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;
@@ -5429,8 +5430,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)