From 270296ea2380ad251fcd832259135796e8c3ffca Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Fri, 7 Dec 2018 11:17:26 -0800 Subject: [PATCH] Add a helper class for filtering available subscriptions In several places implementing the new changes for better UX with multiple mobile subscriptions, we need a bit of code that filters the results coming from the SubscriptionManager. This CL adds that common code in a util class that will be used in later CLs. Bug: 116349402 Test: RunSettingsRoboTests Change-Id: Ie9376629604ac2c4a2f15123edc380c5999f2f83 --- .../android/settings/network/SubscriptionUtil.java | 44 ++++++++ .../settings/network/SubscriptionUtilTest.java | 112 +++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 src/com/android/settings/network/SubscriptionUtil.java create mode 100644 tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java new file mode 100644 index 0000000000..cfe27db33a --- /dev/null +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.network; + +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; +import android.text.TextUtils; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class SubscriptionUtil { + public static List getAvailableSubscriptions(SubscriptionManager manager) { + List subscriptions = manager.getAvailableSubscriptionInfoList(); + if (subscriptions == null) { + subscriptions = new ArrayList<>(); + } + // With some carriers such as Google Fi which provide a sort of virtual service that spans + // across multiple underlying networks, we end up with subscription entries for the + // underlying networks that need to be hidden from the user in the UI. + for (Iterator iter = subscriptions.iterator(); iter.hasNext(); ) { + SubscriptionInfo info = iter.next(); + if (TextUtils.isEmpty(info.getMncString())) { + iter.remove(); + } + } + return subscriptions; + } +} diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java new file mode 100644 index 0000000000..02e4024315 --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.network; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; + +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@RunWith(SettingsRobolectricTestRunner.class) +public class SubscriptionUtilTest { + @Mock + private SubscriptionManager mManager; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() { + when(mManager.getAvailableSubscriptionInfoList()).thenReturn(null); + final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); + assertThat(subs).isNotNull(); + assertThat(subs).isEmpty(); + } + + @Test + public void getAvailableSubscriptions_oneSubscription_oneResult() { + final SubscriptionInfo info = mock(SubscriptionInfo.class); + when(info.getMncString()).thenReturn("fake1234"); + when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info)); + final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); + assertThat(subs).isNotNull(); + assertThat(subs).hasSize(1); + } + + @Test + public void getAvailableSubscriptions_twoSubscriptions_twoResults() { + final SubscriptionInfo info1 = mock(SubscriptionInfo.class); + final SubscriptionInfo info2 = mock(SubscriptionInfo.class); + when(info1.getMncString()).thenReturn("fake1234"); + when(info2.getMncString()).thenReturn("fake5678"); + when(mManager.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2)); + final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); + assertThat(subs).isNotNull(); + assertThat(subs).hasSize(2); + } + + @Test + public void getAvailableSubscriptions_oneSubWithHiddenNetworks_oneResult() { + final SubscriptionInfo info1 = mock(SubscriptionInfo.class); + final SubscriptionInfo info2 = mock(SubscriptionInfo.class); + final SubscriptionInfo info3 = mock(SubscriptionInfo.class); + when(info1.getSubscriptionId()).thenReturn(1); + when(info1.getMncString()).thenReturn("fake1234"); + when(mManager.getAvailableSubscriptionInfoList()).thenReturn( + new ArrayList<>(Arrays.asList(info1, info2, info3))); + final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); + assertThat(subs).isNotNull(); + assertThat(subs).hasSize(1); + assertThat(subs.get(0).getSubscriptionId()).isEqualTo(1); + } + + @Test + public void getAvailableSubscriptions_twoSubsWithHiddenNetworks_twoResults() { + final SubscriptionInfo info1 = mock(SubscriptionInfo.class); + final SubscriptionInfo info2 = mock(SubscriptionInfo.class); + final SubscriptionInfo info3 = mock(SubscriptionInfo.class); + final SubscriptionInfo info4 = mock(SubscriptionInfo.class); + when(info1.getSubscriptionId()).thenReturn(1); + when(info1.getMncString()).thenReturn("fake1234"); + when(info4.getSubscriptionId()).thenReturn(4); + when(info4.getMncString()).thenReturn("fake5678"); + when(mManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>( + Arrays.asList(info1, info2, info3, info4))); + final List subs = SubscriptionUtil.getAvailableSubscriptions(mManager); + assertThat(subs).isNotNull(); + assertThat(subs).hasSize(2); + assertThat(subs.get(0).getSubscriptionId()).isEqualTo(1); + assertThat(subs.get(1).getSubscriptionId()).isEqualTo(4); + } +} -- 2.11.0