LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "NetworkStatAccess Should checkCarrierPrivileges cross all subscriptions" am: 478cbabf8c am: 4d206af049 am: 911e39e070

Browse Source 
am: ae68df7c35

Change-Id: I66053706047e5b575f3e13e0701ef2e63d882574
This commit is contained in:
Chen Xu
2019-05-29 11:20:59 -07:00
committed by android-build-merger
parent 44acf847fd 911e39e070
commit 2e9f584ad7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/net/NetworkStatsAccess.java
View File

@@ -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);