From 0f68ecf2eef3e9dbbcf5e2842731f9151996dcdb Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Thu, 16 Jan 2020 19:29:27 +0800 Subject: [PATCH] [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 Merged-In: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 Change-Id: I438afb81ccad20971a15eb1fe0af7d37202c6a88 --- .../EnabledNetworkModePreferenceController.java | 5 ++--- .../settings/network/telephony/MobileNetworkUtils.java | 9 ++++----- .../PreferredNetworkModePreferenceController.java | 3 +-- .../cdma/CdmaSubscriptionPreferenceController.java | 4 ++-- .../cdma/CdmaSystemSelectPreferenceController.java | 3 +-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index 7d696e2e833..78283df4998 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.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( diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 777a1bc9002..dcd731237a9 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -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 diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java index c9399ac56d0..12680248372 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -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) { diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java index ac068c11108..e714fbe164b 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.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)); } diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java index c988bf8e2c5..e90a24006e8 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 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); }