commit c7d2169120200c9973078f3762d7982260b68824
author SongFerng Wang <songferngwang@google.com> Mon Apr 12 02:45:52 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 02:45:52 2021 +0000
tree cb51cb84de3d7df1c50579e452f3b93edddcda12
parent feb811053f0754c4366473796b5e6853a16ac77a
parent 5c2b1404831d737a0859619713f69f8428580bb8

Merge "The Network Select shows wrong operator name" into sc-dev

src/com/android/settings/network/telephony/MobileNetworkUtils.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 0834632..78d1237 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -648,12 +648,8 @@
         return getOperatorNameFromTelephonyManager(context);
     }
 
-    private static SubscriptionInfo getSubscriptionInfo(SubscriptionManager subManager,
-            int subId) {
-        List<SubscriptionInfo> subInfos = subManager.getAccessibleSubscriptionInfoList();
-        if (subInfos == null) {
-            subInfos = subManager.getActiveSubscriptionInfoList();
-        }
+    private static SubscriptionInfo getSubscriptionInfo(SubscriptionManager subManager, int subId) {
+        List<SubscriptionInfo> subInfos = subManager.getActiveSubscriptionInfoList();
         if (subInfos == null) {
             return null;
         }

tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java

diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index 028b224..fec7ad3 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -132,8 +132,6 @@
 
         when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
                 Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
-        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
 
         when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
                 PLMN_FROM_TELEPHONY_MANAGER_API);

tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java

diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
index 0d20140..f7e3111 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -88,8 +88,6 @@
 
         when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
                 Arrays.asList(mSubscriptionInfo));
-        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo));
 
         when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);