joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Expose getPackagesWithCarrierPrivileges as @SystemApi

Browse source 
This is a preparation CL for moving VCN to mainline

Bug: 366598445
Bug: 367831385
Test: atest CtsTelephonyTestCases:TelephonyManagerTest
Flag: android.os.mainline_vcn_platform_api
Change-Id: Ic6098978f034678e6f42f1777ae93d3973bc099e
This commit is contained in:
Yan Yan 2024-09-19 16:18:47 -07:00
commit c24356e348
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Vcn/tests/unit/java/com/android/server/vcn/TelephonySubscriptionTrackerTest.java
View file

@ -206,7 +206,7 @@ public class TelephonySubscriptionTrackerTest {
.getAllSubscriptionInfoList();
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
setPrivilegedPackagesForMock(Collections.singletonList(PACKAGE_NAME));
setPrivilegedPackagesForMock(Collections.singleton(PACKAGE_NAME));
}
private IntentFilter getIntentFilter() {
@ -293,7 +293,7 @@ public class TelephonySubscriptionTrackerTest {
Collections.singletonMap(TEST_SUBSCRIPTION_ID_1, TEST_CARRIER_CONFIG_WRAPPER));
}
private void setPrivilegedPackagesForMock(@NonNull List<String> privilegedPackages) {
private void setPrivilegedPackagesForMock(@NonNull Set<String> privilegedPackages) {
doReturn(privilegedPackages).when(mTelephonyManager).getPackagesWithCarrierPrivileges();
}
@ -390,7 +390,7 @@ public class TelephonySubscriptionTrackerTest {
@Test
public void testOnSubscriptionsChangedFired_onActiveSubIdsChanged() throws Exception {
setupReadySubIds();
setPrivilegedPackagesForMock(Collections.emptyList());
setPrivilegedPackagesForMock(Collections.emptySet());
doReturn(TEST_SUBSCRIPTION_ID_2).when(mDeps).getActiveDataSubscriptionId();
final ActiveDataSubscriptionIdListener listener = getActiveDataSubscriptionIdListener();
@ -411,7 +411,7 @@ public class TelephonySubscriptionTrackerTest {
public void testOnSubscriptionsChangedFired_WithReadySubidsNoPrivilegedPackages()
throws Exception {
setupReadySubIds();
setPrivilegedPackagesForMock(Collections.emptyList());
setPrivilegedPackagesForMock(Collections.emptySet());
final OnSubscriptionsChangedListener listener = getOnSubscriptionsChangedListener();
listener.onSubscriptionsChanged();
@ -567,7 +567,7 @@ public class TelephonySubscriptionTrackerTest {
verify(mCallback).onNewSnapshot(eq(buildExpectedSnapshot(TEST_PRIVILEGED_PACKAGES)));
// Simulate a loss of carrier privileges
setPrivilegedPackagesForMock(Collections.emptyList());
setPrivilegedPackagesForMock(Collections.emptySet());
listener.onSubscriptionsChanged();
mTestLooper.dispatchAll();