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

Commit b6fd42a0 authored Mar 31, 2020 by Sarah Chin Committed by Gerrit Code Review Mar 31, 2020

Merge "Rename calls to isGlobalModeEnabled"

parents 24ddbf5e 83893a3f

src/com/android/settings/CryptKeeper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -915,7 +915,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
		* phone that has no encryption.
		*/
		private final void setAirplaneModeIfNecessary() {
		if (!getTelephonyManager().isGlobalModeEnabled()) {
		if (!getTelephonyManager().isLteCdmaEvdoGsmWcdmaEnabled()) {
		Log.d(TAG, "Going into airplane mode.");
		Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
		final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);

src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ public class ImeiInfoDialogController {

		@VisibleForTesting
		boolean isCdmaLteEnabled() {
		return mTelephonyManager.isGlobalModeEnabled();
		return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled();
		}

		@VisibleForTesting

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -151,7 +151,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(
		@@ -183,7 +183,7 @@ public class EnabledNetworkModePreferenceController extends
		mContext.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		Phone.PREFERRED_NT_MODE);
		if (mTelephonyManager.isGlobalModeEnabled()) {
		if (mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()) {
		if (lteForced == 0) {
		preference.setEntries(
		R.array.enabled_networks_cdma_choices);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,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);
		}

		@@ -127,7 +127,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: