From 5c2b1404831d737a0859619713f69f8428580bb8 Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Fri, 9 Apr 2021 18:31:02 +0800
Subject: [PATCH] The Network Select shows wrong operator name

 It get the empty subscriptionInfoList from
 SubscriptionManager#getAccessibleSubscriptionInfoList, so the UI
 shows default subId's operator.
 Since this item appears, when sim is active, using
 getActiveSubscriptionInfoList is enough.

 - https://screenshot.googleplex.com/9aHtDVpnYQBsiQr

Bug: 182020952
Test: atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest

Change-Id: I0d86ec41236a0d1be657ccd57fd0cf90f96b8b89
---
 .../settings/network/telephony/MobileNetworkUtils.java    | 8 ++------
 .../network/telephony/MobileNetworkUtilsTest.java         | 2 --
 .../OpenNetworkSelectPagePreferenceControllerTest.java    | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 0834632a0dc..78d12378c0b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -648,12 +648,8 @@ public class MobileNetworkUtils {
         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;
         }
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 028b224123a..fec7ad3d777 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 @@ public class MobileNetworkUtilsTest {
 
         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);
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 0d20140fba6..f7e311131ce 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 @@ public class OpenNetworkSelectPagePreferenceControllerTest {
 
         when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
                 Arrays.asList(mSubscriptionInfo));
-        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo));
 
         when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);