Merge "Allow Location-off NetworkScan without READ_PRIV" into rvc-qpr-dev am: 73942bf81b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/12664548
Change-Id: I8f3a420dce3257e4c4b8499e3fb916259586b95e
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ecb631e..793342d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5429,7 +5429,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;
@@ -5452,8 +5453,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)