PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show hidden subscriptions.

Browse Source 
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
This commit is contained in:
Malcolm Chen
2019-02-12 17:02:34 -08:00
committed by Xiangyu/Malcolm Chen
parent 57b076fa76
commit 0a36e91a49
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -38,7 +38,7 @@ public class SubscriptionUtil {
if (sResultsForTesting != null) { if (sResultsForTesting != null) {
return sResultsForTesting; return sResultsForTesting;
} }
List<SubscriptionInfo> subscriptions = manager.getAvailableSubscriptionInfoList(); List<SubscriptionInfo> subscriptions = manager.getSelectableSubscriptionInfoList();
if (subscriptions == null) { if (subscriptions == null) {
subscriptions = new ArrayList<>(); subscriptions = new ArrayList<>();
} }

2
src/com/android/settings/network/telephony/MobileNetworkActivity.java
View File

@@ -160,7 +160,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity {
final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL); final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL);
if (subId != SUB_ID_NULL) { if (subId != SUB_ID_NULL) {
for (SubscriptionInfo subscription : for (SubscriptionInfo subscription :
mSubscriptionManager.getAvailableSubscriptionInfoList()) { mSubscriptionManager.getSelectableSubscriptionInfoList()) {
if (subscription.getSubscriptionId() == subId) { if (subscription.getSubscriptionId() == subId) {
return subscription; return subscription;
} }

10
tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
View File

@@ -47,7 +47,7 @@ public class SubscriptionUtilTest {
@Test @Test
public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() { public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
when(mManager.getAvailableSubscriptionInfoList()).thenReturn(null); when(mManager.getSelectableSubscriptionInfoList()).thenReturn(null);
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager); final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
assertThat(subs).isEmpty(); assertThat(subs).isEmpty();
@@ -57,7 +57,7 @@ public class SubscriptionUtilTest {
public void getAvailableSubscriptions_oneSubscription_oneResult() { public void getAvailableSubscriptions_oneSubscription_oneResult() {
final SubscriptionInfo info = mock(SubscriptionInfo.class); final SubscriptionInfo info = mock(SubscriptionInfo.class);
when(info.getMncString()).thenReturn("fake1234"); when(info.getMncString()).thenReturn("fake1234");
when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info)); when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info));
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager); final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
assertThat(subs).hasSize(1); assertThat(subs).hasSize(1);
@@ -69,7 +69,7 @@ public class SubscriptionUtilTest {
final SubscriptionInfo info2 = mock(SubscriptionInfo.class); final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
when(info1.getMncString()).thenReturn("fake1234"); when(info1.getMncString()).thenReturn("fake1234");
when(info2.getMncString()).thenReturn("fake5678"); when(info2.getMncString()).thenReturn("fake5678");
when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2)); when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager); final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
assertThat(subs).hasSize(2); assertThat(subs).hasSize(2);
@@ -82,7 +82,7 @@ public class SubscriptionUtilTest {
final SubscriptionInfo info3 = mock(SubscriptionInfo.class); final SubscriptionInfo info3 = mock(SubscriptionInfo.class);
when(info1.getSubscriptionId()).thenReturn(1); when(info1.getSubscriptionId()).thenReturn(1);
when(info1.getMncString()).thenReturn("fake1234"); when(info1.getMncString()).thenReturn("fake1234");
when(mManager.getAvailableSubscriptionInfoList()).thenReturn( when(mManager.getSelectableSubscriptionInfoList()).thenReturn(
new ArrayList<>(Arrays.asList(info1, info2, info3))); new ArrayList<>(Arrays.asList(info1, info2, info3)));
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager); final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();
@@ -100,7 +100,7 @@ public class SubscriptionUtilTest {
when(info1.getMncString()).thenReturn("fake1234"); when(info1.getMncString()).thenReturn("fake1234");
when(info4.getSubscriptionId()).thenReturn(4); when(info4.getSubscriptionId()).thenReturn(4);
when(info4.getMncString()).thenReturn("fake5678"); when(info4.getMncString()).thenReturn("fake5678");
when(mManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>( when(mManager.getSelectableSubscriptionInfoList()).thenReturn(new ArrayList<>(
Arrays.asList(info1, info2, info3, info4))); Arrays.asList(info1, info2, info3, info4)));
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager); final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
assertThat(subs).isNotNull(); assertThat(subs).isNotNull();

2
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
View File

@@ -148,7 +148,7 @@ public class MobileNetworkActivityTest {
doReturn(intent).when(mMobileNetworkActivity).getIntent(); doReturn(intent).when(mMobileNetworkActivity).getIntent();
mSubscriptionInfos.add(mSubscriptionInfo); mSubscriptionInfos.add(mSubscriptionInfo);
mSubscriptionInfos.add(mSubscriptionInfo2); mSubscriptionInfos.add(mSubscriptionInfo2);
doReturn(mSubscriptionInfos).when(mSubscriptionManager).getAvailableSubscriptionInfoList(); doReturn(mSubscriptionInfos).when(mSubscriptionManager).getSelectableSubscriptionInfoList();
doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(CURRENT_SUB_ID); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(CURRENT_SUB_ID);
assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(CURRENT_SUB_ID); assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(CURRENT_SUB_ID);