Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7d21691 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

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

parents feb81105 5c2b1404

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

+2 −6
Original line number Diff line number Diff line
@@ -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;

        }

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

+0 −2
Original line number Diff line number Diff line
@@ -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);

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

+0 −2
Original line number Diff line number Diff line
@@ -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);