[Settings] Remove Phone hidden constants access
Remove access to:
1. Phone.CDMA_SUBSCRIPTION_UNKNOWN
2. Phone.PREFERRED_NT_MODE
3. Phone.PREFERRED_CDMA_SUBSCRIPTION
Bug: 147794713
Test: manual
Change-Id: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index ad701b4..cbd6205 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -39,7 +39,6 @@
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;
@@ -168,7 +167,7 @@
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) {
@@ -184,7 +183,7 @@
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 (isLteOnCdma) {
if (lteForced == 0) {
preference.setEntries(
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 0863d45..955b80f 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -50,7 +50,6 @@
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;
@@ -311,7 +310,7 @@
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;
@@ -338,7 +337,7 @@
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) {
@@ -403,7 +402,7 @@
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;
@@ -517,7 +516,7 @@
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
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index bbd3ac8..ca3fc6e 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -26,7 +26,6 @@
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;
@@ -108,7 +107,7 @@
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) {
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
index ac068c1..e714fbe 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -26,7 +26,6 @@
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 @@
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));
}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index c988bf8..e90a240 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -23,7 +23,6 @@
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 @@
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);
}