Merge "Add NR network type to "Global" mode preference" am: 19222f2154

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I1714b765690ac43e77233752d31ef921219584f0
This commit is contained in:
SongFerng Wang
2020-09-01 04:27:11 +00:00
committed by Automerger Merge Worker

View File

@@ -1233,7 +1233,7 @@
<item>CDMA/EvDo/GSM/WCDMA</item> <item>CDMA/EvDo/GSM/WCDMA</item>
<item>CDMA + LTE/EvDo</item> <item>CDMA + LTE/EvDo</item>
<item>GSM/WCDMA/LTE</item> <item>GSM/WCDMA/LTE</item>
<item>Global</item> <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
<item>LTE</item> <item>LTE</item>
<item>LTE / WCDMA</item> <item>LTE / WCDMA</item>
<item>TDSCDMA only</item> <item>TDSCDMA only</item>
@@ -1250,7 +1250,8 @@
<item>NR/LTE</item> <item>NR/LTE</item>
<item>NR/LTE/CDMA/EvDo</item> <item>NR/LTE/CDMA/EvDo</item>
<item>NR/LTE/GSM/WCDMA</item> <item>NR/LTE/GSM/WCDMA</item>
<item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item> <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
<item>Global</item>
<item>NR/LTE/WCDMA</item> <item>NR/LTE/WCDMA</item>
<item>NR/LTE/TDSCDMA</item> <item>NR/LTE/TDSCDMA</item>
<item>NR/LTE/TDSCDMA/GSM</item> <item>NR/LTE/TDSCDMA/GSM</item>