Merge "Rename references to getLteOnCdmaMode" (6860eecd) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/CryptKeeper.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.widget.Button;
		import android.widget.ProgressBar;
		import android.widget.TextView;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.internal.widget.LockPatternView;
		import com.android.internal.widget.LockPatternView.Cell;
		@@ -916,9 +915,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
		* phone that has no encryption.
		*/
		private final void setAirplaneModeIfNecessary() {
		final boolean isLteDevice =
		getTelephonyManager().getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
		if (!isLteDevice) {
		if (!getTelephonyManager().isGlobalModeEnabled()) {
		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 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.util.Log;
		import androidx.annotation.NonNull;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.R;

		public class ImeiInfoDialogController {
		@@ -147,8 +146,7 @@ public class ImeiInfoDialogController {

		@VisibleForTesting
		boolean isCdmaLteEnabled() {
		return mTelephonyManager.getLteOnCdmaMode(mSubscriptionInfo.getSubscriptionId())
		== PhoneConstants.LTE_ON_CDMA_TRUE;
		return mTelephonyManager.isGlobalModeEnabled();
		}

		@VisibleForTesting

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import android.text.TextUtils;

		import androidx.preference.Preference;

		import com.android.internal.telephony.PhoneConstants;

		/**
		* Preference controller for "Data service setup"
		*/
		@@ -49,14 +47,12 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc

		@Override
		public int getAvailabilityStatus(int subId) {
		final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
		== PhoneConstants.LTE_ON_CDMA_TRUE;
		final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
		return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
		&& carrierConfig != null
		&& !carrierConfig.getBoolean(
		CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
		&& isLteOnCdma && !TextUtils.isEmpty(mSetupUrl)
		&& mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl)
		? AVAILABLE
		: CONDITIONALLY_UNAVAILABLE;
		}

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import androidx.preference.ListPreference;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.R;
		import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;

		@@ -148,9 +147,7 @@ public class EnabledNetworkModePreferenceController extends
		mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
		.createForSubscriptionId(mSubId);

		final boolean isLteOnCdma =
		mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
		mIsGlobalCdma = isLteOnCdma
		mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
		&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
		mShow4GForLTE = carrierConfig != null
		? carrierConfig.getBoolean(
		@@ -178,13 +175,11 @@ public class EnabledNetworkModePreferenceController extends
		mContext.getContentResolver(),
		android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId,
		0);
		final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
		== PhoneConstants.LTE_ON_CDMA_TRUE;
		final int settingsNetworkMode = android.provider.Settings.Global.getInt(
		mContext.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (isLteOnCdma) {
		if (mTelephonyManager.isGlobalModeEnabled()) {
		if (lteForced == 0) {
		preference.setEntries(
		R.array.enabled_networks_cdma_choices);

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

+4 −10

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.telephony.TelephonyManager;
		import androidx.preference.ListPreference;
		import androidx.preference.Preference;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.R;
		import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;

		@@ -98,9 +97,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
		mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
		.createForSubscriptionId(mSubId);

		final boolean isLteOnCdma =
		mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
		mIsGlobalCdma = isLteOnCdma
		mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled()
		&& carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
		}

		@@ -127,12 +124,9 @@ 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:
		switch (mTelephonyManager.getLteOnCdmaMode()) {
		case PhoneConstants.LTE_ON_CDMA_TRUE:
		return R.string.preferred_network_mode_cdma_summary;
		default:
		return R.string.preferred_network_mode_cdma_evdo_summary;
		}
		return mTelephonyManager.isGlobalModeEnabled()
		? R.string.preferred_network_mode_cdma_summary
		: R.string.preferred_network_mode_cdma_evdo_summary;
		case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
		return R.string.preferred_network_mode_cdma_only_summary;
		case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA: