PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed reference to RadioAccessFamily" am: b13a4ef322 am: d934d5eda2 am: 46f5e64f94

Browse Source 
Change-Id: Id01aa204e70d2eb7f9151eccfd2184d06a7aa61b
This commit is contained in:
Automerger Merge Worker
2020-01-09 02:44:05 +00:00
parent 12afd1b101 46f5e64f94
commit a74cbac7af
9 changed files with 303 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
View File

@@ -26,12 +26,12 @@ import android.os.Looper;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.RadioAccessFamily;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
@@ -42,6 +42,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settings.R; import com.android.settings.R;
import java.util.ArrayList; import java.util.ArrayList;
@@ -194,18 +195,18 @@ public class EnabledNetworkModePreferenceController extends
R.array.enabled_networks_cdma_values); R.array.enabled_networks_cdma_values);
} else { } else {
switch (settingsNetworkMode) { switch (settingsNetworkMode) {
case TelephonyManager.NETWORK_MODE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA: case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
preference.setEntries( preference.setEntries(
R.array.enabled_networks_cdma_no_lte_choices); R.array.enabled_networks_cdma_no_lte_choices);
preference.setEntryValues( preference.setEntryValues(
R.array.enabled_networks_cdma_no_lte_values); R.array.enabled_networks_cdma_no_lte_values);
break; break;
case TelephonyManager.NETWORK_MODE_GLOBAL: case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
case TelephonyManager.NETWORK_MODE_LTE_ONLY: case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
preference.setEntries( preference.setEntries(
R.array.enabled_networks_cdma_only_lte_choices); R.array.enabled_networks_cdma_only_lte_choices);
preference.setEntryValues( preference.setEntryValues(
@@ -279,7 +280,7 @@ public class EnabledNetworkModePreferenceController extends
} }
/*** /***
* Preferred network list add 5G item. * Generate preferred network choices list for 5G
* *
* @string/enabled_networks_cdma_choices * @string/enabled_networks_cdma_choices
* Before | After * Before | After
@@ -364,9 +365,9 @@ public class EnabledNetworkModePreferenceController extends
new5gEntryValue = transformLteEntryValueTo5gEntryValue(oldEntryValue); new5gEntryValue = transformLteEntryValueTo5gEntryValue(oldEntryValue);
} else if (mContext.getString(R.string.network_global).equals(oldEntry)) { } else if (mContext.getString(R.string.network_global).equals(oldEntry)) {
//oldEntry: network_global //oldEntry: network_global
//oldEntryValue: TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA //oldEntryValue: TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA
oldEntryValue = Integer.toString( oldEntryValue = Integer.toString(
TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
} }
if (!TextUtils.isEmpty(new5gEntry)) { if (!TextUtils.isEmpty(new5gEntry)) {
@@ -382,124 +383,151 @@ public class EnabledNetworkModePreferenceController extends
} }
/** /**
* LTE network mode transform to 5G network mode. * transform LTE network mode to 5G network mode.
* *
* @param networkMode this is LTE network mode. * @param networkMode an LTE network mode without 5G.
* @return 5G network mode. * @return the corresponding network mode with 5G.
*/ */
private CharSequence transformLteEntryValueTo5gEntryValue(CharSequence networkMode) { private CharSequence transformLteEntryValueTo5gEntryValue(CharSequence networkMode) {
int networkModeInt = Integer.valueOf(networkMode.toString()); int networkModeInt = Integer.valueOf(networkMode.toString());
return Integer.toString(addNrToNetworkType(networkModeInt)); return Integer.toString(addNrToLteNetworkType(networkModeInt));
} }
private int addNrToLteNetworkType(int networkType) {
private int addNrToNetworkType(int networkType) { switch(networkType) {
long networkTypeBitmasks = RadioAccessFamily.getRafFromNetworkType(networkType); case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
networkTypeBitmasks |= mTelephonyManager.NETWORK_TYPE_BITMASK_NR; return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
return RadioAccessFamily.getNetworkTypeFromRaf((int) networkTypeBitmasks); case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA;
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
return TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
default:
return networkType; // not LTE
}
} }
/**
* Sets the display string for the network mode choice and selects the corresponding item
*
* @param preference ListPreference for selecting the preferred network mode.
* @param networkMode the current network mode. The current mode might not be an option in the
* choice list. The nearest choice is selected instead
*/
private void updatePreferenceValueAndSummary(ListPreference preference, int networkMode) { private void updatePreferenceValueAndSummary(ListPreference preference, int networkMode) {
preference.setValue(Integer.toString(networkMode)); preference.setValue(Integer.toString(networkMode));
switch (networkMode) { switch (networkMode) {
case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
preference.setSummary(R.string.network_3G); preference.setSummary(R.string.network_3G);
break; break;
case TelephonyManager.NETWORK_MODE_WCDMA_ONLY: case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
case TelephonyManager.NETWORK_MODE_GSM_UMTS: case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
case TelephonyManager.NETWORK_MODE_WCDMA_PREF: case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
if (!mIsGlobalCdma) { if (!mIsGlobalCdma) {
preference.setValue(Integer.toString(TelephonyManager.NETWORK_MODE_WCDMA_PREF)); preference.setValue(Integer.toString(TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF));
preference.setSummary(R.string.network_3G); preference.setSummary(R.string.network_3G);
} else { } else {
preference.setValue(Integer.toString(TelephonyManager preference.setValue(Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
preference.setSummary(R.string.network_global); preference.setSummary(R.string.network_global);
} }
break; break;
case TelephonyManager.NETWORK_MODE_GSM_ONLY: case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
if (!mIsGlobalCdma) { if (!mIsGlobalCdma) {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_GSM_ONLY)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY));
preference.setSummary(R.string.network_2G); preference.setSummary(R.string.network_2G);
} else { } else {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
preference.setSummary(R.string.network_global); preference.setSummary(R.string.network_global);
} }
break; break;
case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) { if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
preference.setSummary( preference.setSummary(
R.string.preferred_network_mode_lte_gsm_umts_summary); R.string.preferred_network_mode_lte_gsm_umts_summary);
break; break;
} }
case TelephonyManager.NETWORK_MODE_LTE_ONLY: case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
case TelephonyManager.NETWORK_MODE_LTE_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
if (!mIsGlobalCdma) { if (!mIsGlobalCdma) {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
preference.setSummary( preference.setSummary(
mShow4GForLTE ? R.string.network_4G : R.string.network_lte); mShow4GForLTE ? R.string.network_4G : R.string.network_lte);
} else { } else {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
preference.setSummary(R.string.network_global); preference.setSummary(R.string.network_global);
} }
break; break;
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) { if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
preference.setSummary( preference.setSummary(
R.string.preferred_network_mode_lte_cdma_summary); R.string.preferred_network_mode_lte_cdma_summary);
} else { } else {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO));
preference.setSummary( preference.setSummary(
mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte); mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte);
} }
break; break;
case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
preference.setValue(Integer.toString(TelephonyManager preference.setValue(Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
preference.setSummary(R.string.network_3G); preference.setSummary(R.string.network_3G);
break; break;
case TelephonyManager.NETWORK_MODE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA: case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
case TelephonyManager.NETWORK_MODE_GLOBAL: case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_CDMA_EVDO)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO));
preference.setSummary(R.string.network_3G); preference.setSummary(R.string.network_3G);
break; break;
case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO));
preference.setSummary(R.string.network_1x); preference.setSummary(R.string.network_1x);
break; break;
case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY));
preference.setSummary(R.string.network_3G); preference.setSummary(R.string.network_3G);
break; break;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) { if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
preference.setSummary( preference.setSummary(
mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte); mDisplay5gList ? R.string.network_lte_pure : R.string.network_lte);
} else { } else {
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager Integer.toString(TelephonyManagerConstants
.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
|| mIsGlobalCdma || mIsGlobalCdma
@@ -516,15 +544,15 @@ public class EnabledNetworkModePreferenceController extends
} }
} }
break; break;
case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
case TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
preference.setValue(Integer.toString(networkMode)); preference.setValue(Integer.toString(networkMode));
preference.setSummary(mContext.getString(R.string.network_5G) preference.setSummary(mContext.getString(R.string.network_5G)
+ mContext.getString(R.string.network_recommended)); + mContext.getString(R.string.network_recommended));
break; break;
case TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
preference.setValue( preference.setValue(
Integer.toString(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA)); Integer.toString(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA));
if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
|| mIsGlobalCdma || mIsGlobalCdma
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) { || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {

25
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -56,6 +56,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.graph.SignalDrawable; import com.android.settingslib.graph.SignalDrawable;
@@ -312,8 +313,8 @@ public class MobileNetworkUtils {
context.getContentResolver(), context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
Phone.PREFERRED_NT_MODE); Phone.PREFERRED_NT_MODE);
if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA if (settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA
|| settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO) { || settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {
return true; return true;
} }
@@ -340,8 +341,8 @@ public class MobileNetworkUtils {
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
Phone.PREFERRED_NT_MODE); Phone.PREFERRED_NT_MODE);
if (isWorldMode(context, subId)) { if (isWorldMode(context, subId)) {
if (networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA) { || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
return true; return true;
} else if (shouldSpeciallyUpdateGsmCdma(context, subId)) { } else if (shouldSpeciallyUpdateGsmCdma(context, subId)) {
return true; return true;
@@ -404,7 +405,7 @@ public class MobileNetworkUtils {
context.getContentResolver(), context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
Phone.PREFERRED_NT_MODE); Phone.PREFERRED_NT_MODE);
if (networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO
&& isWorldMode(context, subId)) { && isWorldMode(context, subId)) {
return false; return false;
} }
@@ -417,7 +418,7 @@ public class MobileNetworkUtils {
} }
if (isWorldMode(context, subId)) { if (isWorldMode(context, subId)) {
if (networkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA) { if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {
return true; return true;
} }
} }
@@ -522,12 +523,12 @@ public class MobileNetworkUtils {
context.getContentResolver(), context.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
Phone.PREFERRED_NT_MODE); Phone.PREFERRED_NT_MODE);
if (networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA
|| networkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) { || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA) {
if (!isTdscdmaSupported(context, subId) && isWorldMode(context, subId)) { if (!isTdscdmaSupported(context, subId) && isWorldMode(context, subId)) {
return true; return true;
} }

47
src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
View File

@@ -29,6 +29,7 @@ import androidx.preference.Preference;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
/** /**
* Preference controller for "Preferred network mode" * Preference controller for "Preferred network mode"
@@ -113,48 +114,48 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
private int getPreferredNetworkModeSummaryResId(int NetworkMode) { private int getPreferredNetworkModeSummaryResId(int NetworkMode) {
switch (NetworkMode) { switch (NetworkMode) {
case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
return R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary; return R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM:
return R.string.preferred_network_mode_tdscdma_gsm_summary; return R.string.preferred_network_mode_tdscdma_gsm_summary;
case TelephonyManager.NETWORK_MODE_WCDMA_PREF: case TelephonyManagerConstants.NETWORK_MODE_WCDMA_PREF:
return R.string.preferred_network_mode_wcdma_perf_summary; return R.string.preferred_network_mode_wcdma_perf_summary;
case TelephonyManager.NETWORK_MODE_GSM_ONLY: case TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY:
return R.string.preferred_network_mode_gsm_only_summary; return R.string.preferred_network_mode_gsm_only_summary;
case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_WCDMA:
return R.string.preferred_network_mode_tdscdma_wcdma_summary; return R.string.preferred_network_mode_tdscdma_wcdma_summary;
case TelephonyManager.NETWORK_MODE_WCDMA_ONLY: case TelephonyManagerConstants.NETWORK_MODE_WCDMA_ONLY:
return R.string.preferred_network_mode_wcdma_only_summary; return R.string.preferred_network_mode_wcdma_only_summary;
case TelephonyManager.NETWORK_MODE_GSM_UMTS: case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS:
return R.string.preferred_network_mode_gsm_wcdma_summary; return R.string.preferred_network_mode_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO:
switch (mTelephonyManager.getLteOnCdmaMode()) { switch (mTelephonyManager.getLteOnCdmaMode()) {
case PhoneConstants.LTE_ON_CDMA_TRUE: case PhoneConstants.LTE_ON_CDMA_TRUE:
return R.string.preferred_network_mode_cdma_summary; return R.string.preferred_network_mode_cdma_summary;
default: default:
return R.string.preferred_network_mode_cdma_evdo_summary; return R.string.preferred_network_mode_cdma_evdo_summary;
} }
case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO: case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO:
return R.string.preferred_network_mode_cdma_only_summary; return R.string.preferred_network_mode_cdma_only_summary;
case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA: case TelephonyManagerConstants.NETWORK_MODE_EVDO_NO_CDMA:
return R.string.preferred_network_mode_evdo_only_summary; return R.string.preferred_network_mode_evdo_only_summary;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
return R.string.preferred_network_mode_lte_tdscdma_summary; return R.string.preferred_network_mode_lte_tdscdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_ONLY: case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
return R.string.preferred_network_mode_lte_summary; return R.string.preferred_network_mode_lte_summary;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
return R.string.preferred_network_mode_lte_tdscdma_gsm_summary; return R.string.preferred_network_mode_lte_tdscdma_gsm_summary;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
return R.string.preferred_network_mode_lte_tdscdma_gsm_wcdma_summary; return R.string.preferred_network_mode_lte_tdscdma_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA:
return R.string.preferred_network_mode_lte_gsm_wcdma_summary; return R.string.preferred_network_mode_lte_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO:
return R.string.preferred_network_mode_lte_cdma_evdo_summary; return R.string.preferred_network_mode_lte_cdma_evdo_summary;
case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_ONLY:
return R.string.preferred_network_mode_tdscdma_summary; return R.string.preferred_network_mode_tdscdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary; return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
|| mIsGlobalCdma || mIsGlobalCdma
|| MobileNetworkUtils.isWorldMode(mContext, mSubId)) { || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
@@ -162,13 +163,13 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
} else { } else {
return R.string.preferred_network_mode_lte_summary; return R.string.preferred_network_mode_lte_summary;
} }
case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
return R.string.preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary; return R.string.preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_GLOBAL: case TelephonyManagerConstants.NETWORK_MODE_GLOBAL:
return R.string.preferred_network_mode_cdma_evdo_gsm_wcdma_summary; return R.string.preferred_network_mode_cdma_evdo_gsm_wcdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
return R.string.preferred_network_mode_lte_tdscdma_wcdma_summary; return R.string.preferred_network_mode_lte_tdscdma_wcdma_summary;
case TelephonyManager.NETWORK_MODE_LTE_WCDMA: case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
return R.string.preferred_network_mode_lte_wcdma_summary; return R.string.preferred_network_mode_lte_wcdma_summary;
default: default:
return R.string.preferred_network_mode_global_summary; return R.string.preferred_network_mode_global_summary;

139
src/com/android/settings/network/telephony/TelephonyConstants.java Normal file
View File

@@ -0,0 +1,139 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network.telephony;
/**
* Contains hidden constants copied from the platform.
*/
public class TelephonyConstants {
/**
* Copied from {@link android.telephony.TelephonyManager}
*/
public static class TelephonyManagerConstants {
// Network modes are in turn copied from RILConstants
// with one difference: NETWORK_MODE_CDMA is named NETWORK_MODE_CDMA_EVDO
/** GSM, WCDMA (WCDMA preferred) */
public static final int NETWORK_MODE_WCDMA_PREF = 0;
/** GSM only */
public static final int NETWORK_MODE_GSM_ONLY = 1;
/** WCDMA only */
public static final int NETWORK_MODE_WCDMA_ONLY = 2;
/** GSM, WCDMA (auto mode, according to PRL) */
public static final int NETWORK_MODE_GSM_UMTS = 3;
/** CDMA and EvDo (auto mode, according to PRL)
* this is NETWORK_MODE_CDMA in RILConstants.java
*/
public static final int NETWORK_MODE_CDMA_EVDO = 4;
/** CDMA only */
public static final int NETWORK_MODE_CDMA_NO_EVDO = 5;
/** EvDo only */
public static final int NETWORK_MODE_EVDO_NO_CDMA = 6;
/** GSM, WCDMA, CDMA, and EvDo (auto mode, according to PRL) */
public static final int NETWORK_MODE_GLOBAL = 7;
/** LTE, CDMA and EvDo */
public static final int NETWORK_MODE_LTE_CDMA_EVDO = 8;
/** LTE, GSM and WCDMA */
public static final int NETWORK_MODE_LTE_GSM_WCDMA = 9;
/** LTE, CDMA, EvDo, GSM, and WCDMA */
public static final int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10;
/** LTE only mode. */
public static final int NETWORK_MODE_LTE_ONLY = 11;
/** LTE and WCDMA */
public static final int NETWORK_MODE_LTE_WCDMA = 12;
/** TD-SCDMA only */
public static final int NETWORK_MODE_TDSCDMA_ONLY = 13;
/** TD-SCDMA and WCDMA */
public static final int NETWORK_MODE_TDSCDMA_WCDMA = 14;
/** LTE and TD-SCDMA*/
public static final int NETWORK_MODE_LTE_TDSCDMA = 15;
/** TD-SCDMA and GSM */
public static final int NETWORK_MODE_TDSCDMA_GSM = 16;
/** TD-SCDMA, GSM and LTE */
public static final int NETWORK_MODE_LTE_TDSCDMA_GSM = 17;
/** TD-SCDMA, GSM and WCDMA */
public static final int NETWORK_MODE_TDSCDMA_GSM_WCDMA = 18;
/** LTE, TD-SCDMA and WCDMA */
public static final int NETWORK_MODE_LTE_TDSCDMA_WCDMA = 19;
/** LTE, TD-SCDMA, GSM, and WCDMA */
public static final int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20;
/** TD-SCDMA, CDMA, EVDO, GSM and WCDMA */
public static final int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21;
/** LTE, TDCSDMA, CDMA, EVDO, GSM and WCDMA */
public static final int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22;
/** NR 5G only mode */
public static final int NETWORK_MODE_NR_ONLY = 23;
/** NR 5G, LTE */
public static final int NETWORK_MODE_NR_LTE = 24;
/** NR 5G, LTE, CDMA and EvDo */
public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO = 25;
/** NR 5G, LTE, GSM and WCDMA */
public static final int NETWORK_MODE_NR_LTE_GSM_WCDMA = 26;
/** NR 5G, LTE, CDMA, EvDo, GSM and WCDMA */
public static final int NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA = 27;
/** NR 5G, LTE and WCDMA */
public static final int NETWORK_MODE_NR_LTE_WCDMA = 28;
/** NR 5G, LTE and TDSCDMA */
public static final int NETWORK_MODE_NR_LTE_TDSCDMA = 29;
/** NR 5G, LTE, TD-SCDMA and GSM */
public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM = 30;
/** NR 5G, LTE, TD-SCDMA, WCDMA */
public static final int NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA = 31;
/** NR 5G, LTE, TD-SCDMA, GSM and WCDMA */
public static final int NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA = 32;
/** NR 5G, LTE, TD-SCDMA, CDMA, EVDO, GSM and WCDMA */
public static final int NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 33;
}
}

3
src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
View File

@@ -24,6 +24,7 @@ import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
/** /**
* Preference controller for "System Select" * Preference controller for "System Select"
@@ -54,7 +55,7 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
Settings.Global.PREFERRED_NETWORK_MODE + mSubId, Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
Phone.PREFERRED_NT_MODE); Phone.PREFERRED_NT_MODE);
listPreference.setEnabled( listPreference.setEnabled(
settingsNetworkMode != TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); settingsNetworkMode != TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
} }
@Override @Override

29
tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
View File

@@ -44,6 +44,7 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
@@ -171,12 +172,12 @@ public class EnabledNetworkModePreferenceControllerTest {
public void updateState_updateByNetworkMode() { public void updateState_updateByNetworkMode() {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
assertThat(mPreference.getSummary()).isEqualTo("3G"); assertThat(mPreference.getSummary()).isEqualTo("3G");
} }
@@ -184,12 +185,12 @@ public class EnabledNetworkModePreferenceControllerTest {
public void updateState_updateByNetworkMode_useDefaultValue() { public void updateState_updateByNetworkMode_useDefaultValue() {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
} }
/** /**
@@ -392,27 +393,27 @@ public class EnabledNetworkModePreferenceControllerTest {
@Test @Test
public void onPreferenceChange_updateSuccess() { public void onPreferenceChange_updateSuccess() {
doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID, doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
mController.onPreferenceChange(mPreference, mController.onPreferenceChange(mPreference,
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
assertThat(Settings.Global.getInt(mContext.getContentResolver(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo( Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
} }
@Test @Test
public void onPreferenceChange_updateFail() { public void onPreferenceChange_updateFail() {
doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID, doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
mController.onPreferenceChange(mPreference, mController.onPreferenceChange(mPreference,
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
assertThat(Settings.Global.getInt(mContext.getContentResolver(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
} }
@Test @Test
@@ -421,24 +422,24 @@ public class EnabledNetworkModePreferenceControllerTest {
doReturn(mPreference).when(screen).findPreference(KEY); doReturn(mPreference).when(screen).findPreference(KEY);
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
mController.displayPreference(screen); mController.displayPreference(screen);
mController.updateState(mPreference); mController.updateState(mPreference);
mLifecycle.handleLifecycleEvent(ON_START); mLifecycle.handleLifecycleEvent(ON_START);
assertThat(Integer.parseInt(mPreference.getValue())).isEqualTo( assertThat(Integer.parseInt(mPreference.getValue())).isEqualTo(
TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
assertThat(mPreference.getSummary()).isEqualTo("3G"); assertThat(mPreference.getSummary()).isEqualTo("3G");
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_GSM_ONLY); TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY);
final Uri uri = Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID); final Uri uri = Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID);
mContext.getContentResolver().notifyChange(uri, null); mContext.getContentResolver().notifyChange(uri, null);
assertThat(Integer.parseInt(mPreference.getValue())).isEqualTo( assertThat(Integer.parseInt(mPreference.getValue())).isEqualTo(
TelephonyManager.NETWORK_MODE_GSM_ONLY); TelephonyManagerConstants.NETWORK_MODE_GSM_ONLY);
assertThat(mPreference.getSummary()).isEqualTo("2G"); assertThat(mPreference.getSummary()).isEqualTo("2G");
} }
} }

15
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
View File

@@ -41,6 +41,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -181,7 +182,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
} }
@@ -255,7 +256,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }
@@ -266,7 +267,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }
@@ -277,7 +278,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }
@@ -288,7 +289,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }
@@ -299,7 +300,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }
@@ -310,7 +311,7 @@ public class MobileNetworkUtilsTest {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1, android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue(); assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
} }

17
tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
View File

@@ -36,6 +36,7 @@ import android.telephony.TelephonyManager;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -127,12 +128,12 @@ public class PreferredNetworkModePreferenceControllerTest {
public void updateState_updateByNetworkMode() { public void updateState_updateByNetworkMode() {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
assertThat(mPreference.getSummary()).isEqualTo( assertThat(mPreference.getSummary()).isEqualTo(
mContext.getString(R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary)); mContext.getString(R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary));
} }
@@ -140,26 +141,26 @@ public class PreferredNetworkModePreferenceControllerTest {
@Test @Test
public void onPreferenceChange_updateSuccess() { public void onPreferenceChange_updateSuccess() {
doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID, doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
mController.onPreferenceChange(mPreference, mController.onPreferenceChange(mPreference,
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
assertThat(Settings.Global.getInt(mContext.getContentResolver(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo( Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
} }
@Test @Test
public void onPreferenceChange_updateFail() { public void onPreferenceChange_updateFail() {
doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID, doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
mController.onPreferenceChange(mPreference, mController.onPreferenceChange(mPreference,
String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA)); String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
assertThat(Settings.Global.getInt(mContext.getContentResolver(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
} }
} }

4
tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
View File

@@ -33,6 +33,8 @@ import android.telephony.TelephonyManager;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -118,7 +120,7 @@ public class CdmaSystemSelectPreferenceControllerTest {
mTelephonyManager).getCdmaRoamingMode(); mTelephonyManager).getCdmaRoamingMode();
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
mController.updateState(mPreference); mController.updateState(mPreference);