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: 74f0698ce6

Browse Source 
am: 4d206af049

Change-Id: Ib2d02bd3936ae112f62861c301d99582e0b998b0
This commit is contained in:
Chen Xu
2019-05-29 10:43:06 -07:00
committed by android-build-merger
parent 141246d873 74f0698ce6
commit 7c88e8a93c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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