Merge "[Settings] Remove Phone hidden constants access" (c78b12f3) · Commits · e / os / android_packages_apps_Settings

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

+2 −3

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.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.R;
		import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
		@@ -167,7 +166,7 @@ public class EnabledNetworkModePreferenceController extends
		private int getPreferredNetworkMode() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		}

		private void updatePreferenceEntries(ListPreference preference) {
		@@ -181,7 +180,7 @@ public class EnabledNetworkModePreferenceController extends
		final int settingsNetworkMode = android.provider.Settings.Global.getInt(
		mContext.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()) {
		if (lteForced == 0) {
		preference.setEntries(

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ import androidx.annotation.VisibleForTesting;

		import com.android.ims.ImsException;
		import com.android.ims.ImsManager;
		import com.android.internal.telephony.Phone;
		import com.android.internal.util.ArrayUtils;
		import com.android.settings.R;
		import com.android.settings.Utils;
		@@ -403,7 +402,7 @@ public class MobileNetworkUtils {
		final int settingsNetworkMode = android.provider.Settings.Global.getInt(
		context.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA
		\|\| settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
		return true;
		@@ -430,7 +429,7 @@ public class MobileNetworkUtils {
		final int networkMode = android.provider.Settings.Global.getInt(
		context.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (isWorldMode(context, subId)) {
		if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
		\|\| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
		@@ -495,7 +494,7 @@ public class MobileNetworkUtils {
		final int networkMode = android.provider.Settings.Global.getInt(
		context.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
		&& isWorldMode(context, subId)) {
		return false;
		@@ -609,7 +608,7 @@ public class MobileNetworkUtils {
		final int networkMode = android.provider.Settings.Global.getInt(
		context.getContentResolver(),
		android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
		\|\| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
		\|\| networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA

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

+1 −2

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.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.settings.R;
		import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
		@@ -109,7 +108,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
		private int getPreferredNetworkMode() {
		return Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		}

		private int getPreferredNetworkModeSummaryResId(int NetworkMode) {

src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import androidx.annotation.VisibleForTesting;
		import androidx.preference.ListPreference;
		import androidx.preference.Preference;

		import com.android.internal.telephony.Phone;
		import com.android.settings.network.telephony.MobileNetworkUtils;

		/**
		@@ -57,7 +56,8 @@ public class CdmaSubscriptionPreferenceController extends CdmaBasePreferenceCont
		final ListPreference listPreference = (ListPreference) preference;
		listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.PREFERRED_CDMA_SUBSCRIPTION);
		Settings.Global.CDMA_SUBSCRIPTION_MODE,
		TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM);
		if (mode != TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN) {
		listPreference.setValue(Integer.toString(mode));
		}

src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java

+1 −2

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

		import com.android.internal.telephony.Phone;
		import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;

		/**
		@@ -53,7 +52,7 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
		final int settingsNetworkMode = Settings.Global.getInt(
		mContext.getContentResolver(),
		Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
		Phone.PREFERRED_NT_MODE);
		TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
		listPreference.setEnabled(
		settingsNetworkMode != TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
		}