Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkStatAccess Should checkCarrierPrivileges cross all subscriptions" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-30 01:00:44 +00:00
committed by Android (Google) Code Review
parent fa6082f2a0 dfa5fe6529
commit d5109d1bd2
2 changed files with 2 additions and 2 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) final TelephonyManager tm = (TelephonyManager)
context.getSystemService(Context.TELEPHONY_SERVICE); context.getSystemService(Context.TELEPHONY_SERVICE);
boolean hasCarrierPrivileges = tm != null && boolean hasCarrierPrivileges = tm != null &&
tm.checkCarrierPrivilegesForPackage(callingPackage) == tm.checkCarrierPrivilegesForPackageAnyPhone(callingPackage) ==
TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS; TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
boolean isDeviceOwner = dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid, boolean isDeviceOwner = dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid,
DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);

2
tests/net/java/com/android/server/net/NetworkStatsAccessTest.java
View File

@@ -161,7 +161,7 @@ public class NetworkStatsAccessTest {
} }
private void setHasCarrierPrivileges(boolean hasPrivileges) { private void setHasCarrierPrivileges(boolean hasPrivileges) {
when(mTm.checkCarrierPrivilegesForPackage(TEST_PKG)).thenReturn( when(mTm.checkCarrierPrivilegesForPackageAnyPhone(TEST_PKG)).thenReturn(
hasPrivileges ? TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS hasPrivileges ? TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS
: TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS); : TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS);
} }