Show cdma network mode choices
- Show cdma network mode choices if current radio supports 3GPP and 3GPP2 radio technologies at the same time Change-Id: I2d849e2eddc2c5bef289f39c015ebc6c744edcab
This commit is contained in:
@@ -492,7 +492,9 @@ public class EnabledNetworkModePreferenceController extends
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
|
} 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;
|
enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_TDSCDMA_CHOICES;
|
||||||
} else if (!mDisplay2gOptions && !mDisplay3gOptions) {
|
} else if (!mDisplay2gOptions && !mDisplay3gOptions) {
|
||||||
enabledNetworkType = mShow4gForLTE
|
enabledNetworkType = mShow4gForLTE
|
||||||
@@ -506,8 +508,6 @@ public class EnabledNetworkModePreferenceController extends
|
|||||||
: EnabledNetworks.ENABLED_NETWORKS_EXCEPT_GSM_CHOICES;
|
: EnabledNetworks.ENABLED_NETWORKS_EXCEPT_GSM_CHOICES;
|
||||||
} else if (!mLteEnabled) {
|
} else if (!mLteEnabled) {
|
||||||
enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_EXCEPT_LTE_CHOICES;
|
enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_EXCEPT_LTE_CHOICES;
|
||||||
} else if (mIsGlobalCdma) {
|
|
||||||
enabledNetworkType = EnabledNetworks.ENABLED_NETWORKS_CDMA_CHOICES;
|
|
||||||
} else {
|
} else {
|
||||||
enabledNetworkType = mShow4gForLTE ? EnabledNetworks.ENABLED_NETWORKS_4G_CHOICES
|
enabledNetworkType = mShow4gForLTE ? EnabledNetworks.ENABLED_NETWORKS_4G_CHOICES
|
||||||
: EnabledNetworks.ENABLED_NETWORKS_CHOICES;
|
: EnabledNetworks.ENABLED_NETWORKS_CHOICES;
|
||||||
|
Reference in New Issue
Block a user