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

Commit 392f07f4 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge "Show cdma network mode choices" into main

parents 3abf3a0f b300cae1

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

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,9 @@ public class EnabledNetworkModePreferenceController extends 
                    }

                }

            } else if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {

                if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {

                if (mIsGlobalCdma) {

                    enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_CDMA_CHOICES;

                } else if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {

                    enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_TDSCDMA_CHOICES;

                } else if (!mDisplay2gOptions && !mDisplay3gOptions) {

                    enabledNetworkType = mShow4gForLTE
@@ -506,8 +508,6 @@ public class EnabledNetworkModePreferenceController extends 
                            : EnabledNetworks.ENABLED_NETWORKS_EXCEPT_GSM_CHOICES;

                } else if (!mLteEnabled) {

                    enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_EXCEPT_LTE_CHOICES;

                } else if (mIsGlobalCdma) {

                    enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_CDMA_CHOICES;

                } else {

                    enabledNetworkType = mShow4gForLTE ? EnabledNetworks.ENABLED_NETWORKS_4G_CHOICES

                            : EnabledNetworks.ENABLED_NETWORKS_CHOICES;