PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename calls to isGlobalModeEnabled" into rvc-dev

Browse Source
This commit is contained in:
Sarah Chin
2020-03-02 18:11:23 +00:00
committed by Android (Google) Code Review
parent 4a76598ba5 77dea1beb0
commit 4d59bce21b
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc
&& carrierConfig != null
&& !carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
&& mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl)
&& mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() && !TextUtils.isEmpty(mSetupUrl)
? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}

4
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -146,7 +146,7 @@ public class EnabledNetworkModePreferenceController extends
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
mShow4GForLTE = carrierConfig != null
? carrierConfig.getBoolean(
@@ -180,7 +180,7 @@ public class EnabledNetworkModePreferenceController extends
android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId,
0);
final int settingsNetworkMode = getPreferredNetworkMode();
if (mTelephonyManager.isGlobalModeEnabled()) {
if (mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()) {
if (lteForced == 0) {
preference.setEntries(
R.array.enabled_networks_cdma_choices);

4
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -99,7 +99,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
.createForSubscriptionId(mSubId);
mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
}
@@ -126,7 +126,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
return R.string.preferred_network_mode_gsm_wcdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
return mTelephonyManager.isGlobalModeEnabled()
return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()
? R.string.preferred_network_mode_cdma_summary
: R.string.preferred_network_mode_cdma_evdo_summary;
case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO: