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

Snap for 6101103 from f9f41df89a to qt-qpr2-release

Browse Source 
Change-Id: I708843cc9728c299499a64325db4a44c9967699f
This commit is contained in:
android-build-team Robot
2019-12-28 02:11:34 +00:00
parent 0e5a27d4d4 f9f41df89a
commit 654cc0cc33
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/RadioInfo.java
View File

@@ -100,7 +100,34 @@ import java.util.List;
public class RadioInfo extends Activity { public class RadioInfo extends Activity {
private static final String TAG = "RadioInfo"; private static final String TAG = "RadioInfo";
private static final String[] mPreferredNetworkLabels = { private static final String[] PREFERRED_NETWORK_LABELS_MAX_LTE = {
"GSM/WCDMA preferred",
"GSM only",
"WCDMA only",
"GSM/WCDMA auto (PRL)",
"CDMA/EvDo auto (PRL)",
"CDMA only",
"EvDo only",
"CDMA/EvDo/GSM/WCDMA (PRL)",
"CDMA + LTE/EvDo (PRL)",
"GSM/WCDMA/LTE (PRL)",
"LTE/CDMA/EvDo/GSM/WCDMA (PRL)",
"LTE only",
"LTE/WCDMA",
"TDSCDMA only",
"TDSCDMA/WCDMA",
"LTE/TDSCDMA",
"TDSCDMA/GSM",
"LTE/TDSCDMA/GSM",
"TDSCDMA/GSM/WCDMA",
"LTE/TDSCDMA/WCDMA",
"LTE/TDSCDMA/GSM/WCDMA",
"TDSCDMA/CDMA/EvDo/GSM/WCDMA ",
"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",
"Unknown"
};
private static final String[] PREFERRED_NETWORK_LABELS = {
"GSM/WCDMA preferred", "GSM/WCDMA preferred",
"GSM only", "GSM only",
"WCDMA only", "WCDMA only",
@@ -126,7 +153,7 @@ public class RadioInfo extends Activity {
"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA", "LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA",
"NR only", "NR only",
"NR/LTE", "NR/LTE",
"NR/LTE/CDME/EvDo", "NR/LTE/CDMA/EvDo",
"NR/LTE/GSM/WCDMA", "NR/LTE/GSM/WCDMA",
"NR/LTE/CDMA/EvDo/GSM/WCDMA", "NR/LTE/CDMA/EvDo/GSM/WCDMA",
"NR/LTE/WCDMA", "NR/LTE/WCDMA",
@@ -263,6 +290,8 @@ public class RadioInfo extends Activity {
private int mCellInfoRefreshRateIndex; private int mCellInfoRefreshRateIndex;
private int mSelectedPhoneIndex; private int mSelectedPhoneIndex;
private String[] mPreferredNetworkLabels;
private final NetworkRequest mDefaultNetworkRequest = new NetworkRequest.Builder() private final NetworkRequest mDefaultNetworkRequest = new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
@@ -482,6 +511,10 @@ public class RadioInfo extends Activity {
mPhyChanConfig = (TextView) findViewById(R.id.phy_chan_config); mPhyChanConfig = (TextView) findViewById(R.id.phy_chan_config);
final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
mPreferredNetworkLabels =
((TelephonyManager.NETWORK_TYPE_BITMASK_NR & supportedRadioBitmask) > 0)
? PREFERRED_NETWORK_LABELS : PREFERRED_NETWORK_LABELS_MAX_LTE;
preferredNetworkType = (Spinner) findViewById(R.id.preferredNetworkType); preferredNetworkType = (Spinner) findViewById(R.id.preferredNetworkType);
ArrayAdapter<String> preferredNetworkTypeAdapter = new ArrayAdapter<String> (this, ArrayAdapter<String> preferredNetworkTypeAdapter = new ArrayAdapter<String> (this,
android.R.layout.simple_spinner_item, mPreferredNetworkLabels); android.R.layout.simple_spinner_item, mPreferredNetworkLabels);