From 3b8356c7ef63dce2bcb8156f9025ffe6a6022592 Mon Sep 17 00:00:00 2001 From: chen xu Date: Wed, 22 May 2019 14:10:29 -0700 Subject: [PATCH] NetworkStatAccess Should checkCarrierPrivileges cross all subscriptions Bug: 133236378 Test: Manual Change-Id: I49fbde1fe73b33aadcf8fd23ad224f363b137bf3 Merged-in: I49fbde1fe73b33aadcf8fd23ad224f363b137bf3 --- .../core/java/com/android/server/net/NetworkStatsAccess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/net/NetworkStatsAccess.java b/services/core/java/com/android/server/net/NetworkStatsAccess.java index cebc472178..7c1c1c7ce4 100644 --- a/services/core/java/com/android/server/net/NetworkStatsAccess.java +++ b/services/core/java/com/android/server/net/NetworkStatsAccess.java @@ -109,7 +109,7 @@ public final class NetworkStatsAccess { final TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); boolean hasCarrierPrivileges = tm != null && - tm.checkCarrierPrivilegesForPackage(callingPackage) == + tm.checkCarrierPrivilegesForPackageAnyPhone(callingPackage) == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; boolean isDeviceOwner = dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);