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

Commit 5a979e94 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Show cdma network mode choices" into main am: 392f07f4 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999



Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78cd8ba4 392f07f4

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

+3 −3
Original line number Diff line number Diff line
@@ -507,7 +507,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
@@ -521,8 +523,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;