From 0a36e91a498e867f46496aa8b708b2250f77c895 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Tue, 12 Feb 2019 17:02:34 -0800 Subject: [PATCH] Don't show hidden subscriptions. Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList so that hidden subscriptions won't show up. Bug: 121396526 Test: manual Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd --- src/com/android/settings/network/SubscriptionUtil.java | 2 +- .../settings/network/telephony/MobileNetworkActivity.java | 2 +- .../src/com/android/settings/network/SubscriptionUtilTest.java | 10 +++++----- .../settings/network/telephony/MobileNetworkActivityTest.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index 237e08a777..224fc41e0b 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -38,7 +38,7 @@ public class SubscriptionUtil { if (sResultsForTesting != null) { return sResultsForTesting; } - List subscriptions = manager.getAvailableSubscriptionInfoList(); + List subscriptions = manager.getSelectableSubscriptionInfoList(); if (subscriptions == null) { subscriptions = new ArrayList<>(); } diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java index 821b1e1e8d..3c0940dbea 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java +++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java @@ -160,7 +160,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity { final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL); if (subId != SUB_ID_NULL) { for (SubscriptionInfo subscription : - mSubscriptionManager.getAvailableSubscriptionInfoList()) { + mSubscriptionManager.getSelectableSubscriptionInfoList()) { if (subscription.getSubscriptionId() == subId) { return subscription; } diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java index e0334b1557..dbc122a325 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java @@ -47,7 +47,7 @@ public class SubscriptionUtilTest { @Test public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() { - when(mManager.getAvailableSubscriptionInfoList()).thenReturn(null); + when(mManager.getSelectableSubscriptionInfoList()).thenReturn(null); final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); assertThat(subs).isNotNull(); assertThat(subs).isEmpty(); @@ -57,7 +57,7 @@ public class SubscriptionUtilTest { public void getAvailableSubscriptions_oneSubscription_oneResult() { final SubscriptionInfo info = mock(SubscriptionInfo.class); when(info.getMncString()).thenReturn("fake1234"); - when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info)); + when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info)); final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); assertThat(subs).isNotNull(); assertThat(subs).hasSize(1); @@ -69,7 +69,7 @@ public class SubscriptionUtilTest { final SubscriptionInfo info2 = mock(SubscriptionInfo.class); when(info1.getMncString()).thenReturn("fake1234"); when(info2.getMncString()).thenReturn("fake5678"); - when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2)); + when(mManager.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2)); final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); assertThat(subs).isNotNull(); assertThat(subs).hasSize(2); @@ -82,7 +82,7 @@ public class SubscriptionUtilTest { final SubscriptionInfo info3 = mock(SubscriptionInfo.class); when(info1.getSubscriptionId()).thenReturn(1); when(info1.getMncString()).thenReturn("fake1234"); - when(mManager.getAvailableSubscriptionInfoList()).thenReturn( + when(mManager.getSelectableSubscriptionInfoList()).thenReturn( new ArrayList<>(Arrays.asList(info1, info2, info3))); final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); assertThat(subs).isNotNull(); @@ -100,7 +100,7 @@ public class SubscriptionUtilTest { when(info1.getMncString()).thenReturn("fake1234"); when(info4.getSubscriptionId()).thenReturn(4); when(info4.getMncString()).thenReturn("fake5678"); - when(mManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>( + when(mManager.getSelectableSubscriptionInfoList()).thenReturn(new ArrayList<>( Arrays.asList(info1, info2, info3, info4))); final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); assertThat(subs).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java index 447931e59e..3b5cdf9a39 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java @@ -148,7 +148,7 @@ public class MobileNetworkActivityTest { doReturn(intent).when(mMobileNetworkActivity).getIntent(); mSubscriptionInfos.add(mSubscriptionInfo); mSubscriptionInfos.add(mSubscriptionInfo2); - doReturn(mSubscriptionInfos).when(mSubscriptionManager).getAvailableSubscriptionInfoList(); + doReturn(mSubscriptionInfos).when(mSubscriptionManager).getSelectableSubscriptionInfoList(); doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(CURRENT_SUB_ID); assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(CURRENT_SUB_ID); -- 2.11.0