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

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

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
This commit is contained in:
SongFerng Wang
2020-09-01 04:40:24 +00:00
committed by Automerger Merge Worker

View File

@@ -1352,7 +1352,7 @@
<item>CDMA/EvDo/GSM/WCDMA</item>
<item>CDMA + LTE/EvDo</item>
<item>GSM/WCDMA/LTE</item>
<item>Global</item>
<item>LTE/CDMA/EvDo/GSM/WCDMA</item>
<item>LTE</item>
<item>LTE / WCDMA</item>
<item>TDSCDMA only</item>
@@ -1369,7 +1369,8 @@
<item>NR/LTE</item>
<item>NR/LTE/CDMA/EvDo</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/TDSCDMA</item>
<item>NR/LTE/TDSCDMA/GSM</item>