Automerger Merge Worker
c30575610c
Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a
...
Change-Id: Ic36bfe8db4edba2a80353a9d4fa66027e5d92364
2019-12-30 04:59:08 +00:00
Lee Chou
2bffc2754a
Merge "Changed reference of telecom.Log to util.Log"
...
am: f9d06dc434
2019-12-29 20:39:02 -08:00
Lee Chou
f9d06dc434
Merge "Changed reference of telecom.Log to util.Log"
2019-12-30 04:36:18 +00:00
Bonian Chen
b14af41430
[Settings] Correct spelling in source code
...
Rename mSubsciptionsMonitor into mSubscriptionMonitor.
Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
2019-12-30 10:27:57 +08:00
Automerger Merge Worker
60bcb71b58
[automerger skipped] Import translations. DO NOT MERGE am: 7369a964a2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc4419449dcd445230b9905565ba699013ac632f
2019-12-29 23:56:52 +00:00
Bill Yi
7369a964a2
Import translations. DO NOT MERGE
...
Change-Id: I450573e52646e40a777bc10ddd4afa56458f5f18
Auto-generated-cl: translation import
2019-12-28 20:54:14 -08:00
android-build-team Robot
654cc0cc33
Snap for 6101103 from f9f41df89a to qt-qpr2-release
...
Change-Id: I708843cc9728c299499a64325db4a44c9967699f
2019-12-28 02:11:34 +00:00
Automerger Merge Worker
5b01a22369
[automerger skipped] Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev am: f9f41df89a -s ours
...
am skip reason: Change-Id Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c with SHA-1 be5216cacb
2019-12-27 18:44:34 +00:00
SongFerng Wang
f9f41df89a
Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev
2019-12-27 18:26:49 +00:00
Lee Chou
1c5f319f3c
Changed reference of telecom.Log to util.Log
...
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
SongFerngWang
75c5940b7c
Phone Info UI shows network type list which depends on RAT supported
...
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.
Bug: 146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)
Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-27 07:02:39 +00:00
Automerger Merge Worker
cd46f2df4f
Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2
...
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
92f25fadd2
Merge "[Settings] Replace getSimCount() API"
...
am: b0bddfec15
2019-12-26 18:48:55 -08:00
Bonian Chen
b0bddfec15
Merge "[Settings] Replace getSimCount() API"
2019-12-27 02:45:42 +00:00
Automerger Merge Worker
a58c7ba27a
Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08
...
Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed
2019-12-26 14:15:29 +00:00
Zoey Chen
8ead010c08
Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
...
am: e8cf63ddd3
2019-12-26 06:01:41 -08:00
Zoey Chen
e8cf63ddd3
Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
2019-12-26 13:44:58 +00:00
Automerger Merge Worker
b206208982
Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c
...
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
2019-12-26 13:11:36 +00:00
Zoey Chen
4359db040c
Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
...
am: 47634431c6
2019-12-26 05:02:24 -08:00
Zoey Chen
47634431c6
Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
2019-12-26 12:01:22 +00:00
Automerger Merge Worker
9494af9634
Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
...
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00
Daniel Huang
7664d08e28
Merge "Modify 5G RAT into Bearer field."
...
am: 79977fadca
2019-12-26 03:32:40 -08:00
Daniel Huang
79977fadca
Merge "Modify 5G RAT into Bearer field."
2019-12-26 11:29:13 +00:00
Bonian Chen
b373aeedfe
[Settings] Replace getSimCount() API
...
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().
Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00
Automerger Merge Worker
3d73b7a832
Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea
...
Change-Id: I9750d2b07e3b6280d2e3e9e2779f2740d24f0cdf
2019-12-26 09:55:38 +00:00
Zoey Chen
3835293aea
Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId"
...
am: 047dd2dff9
2019-12-26 01:39:17 -08:00
Zoey Chen
047dd2dff9
Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId"
2019-12-26 09:36:58 +00:00
zoey chen
fc3ddb2f16
[Settings] Replace #getServiceStateForSubscriber with #getServiceState
...
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-26 17:12:42 +08:00
Automerger Merge Worker
631a1d206c
Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d am: 22c2c14605
...
Change-Id: Ic45f318e6784205e88a13f8a2fdf7fcdb04c9955
2019-12-26 04:17:42 +00:00
Automerger Merge Worker
c5d575f085
Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b am: 4be4ae6a75
...
Change-Id: Ie2daa594c252d71e63125108036a4428563bed5b
2019-12-26 04:17:28 +00:00
danielwbhuang
957526abca
Modify 5G RAT into Bearer field.
...
Only keep NR in here, remove GSM, TD_SCDMA, IWLAN and LTE_CA.
Bug: 143995814
Test: 1. Build pass.
2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
3. check UI:
3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"
Change-Id: I9b8efbe26c2702696f720f0f221f3d65f785e644
2019-12-26 12:08:31 +08:00
Zoey Chen
22c2c14605
Merge "[Settings] Replace #getSimCount with #getActiveModemCount"
...
am: 171eabcb2d
2019-12-25 20:02:43 -08:00
Bonian Chen
4be4ae6a75
Merge "[Settings] Replace TelephonyManager#from()"
...
am: 98e6ab358b
2019-12-25 20:00:55 -08:00
Zoey Chen
171eabcb2d
Merge "[Settings] Replace #getSimCount with #getActiveModemCount"
2019-12-26 03:44:47 +00:00
Bonian Chen
98e6ab358b
Merge "[Settings] Replace TelephonyManager#from()"
2019-12-26 03:36:09 +00:00
zoey chen
5b336b1bd9
[Settings] Replace #getSimCount with #getActiveModemCount
...
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 16:30:25 +08:00
zoey chen
ac92bab305
[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId
...
Bug: 146823458
Test: make
Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee
Merged-In: I437a6e325112bf9d031a4eb11c28cb755c085bee
2019-12-25 16:27:00 +08:00
zoey chen
f74850d559
[Settings] Replace #getSubscriberId(I) with #getSubscriberId()
...
Bug: 146823314
Test: make
Change-Id: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
Merged-In: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
2019-12-25 16:23:16 +08:00
Automerger Merge Worker
b8a6b088b3
Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35
...
Change-Id: Ib32da629e9c227cd92e013527e04eb345fa63732
2019-12-25 03:16:37 +00:00
changbetty
0c7ec95f35
Merge "[Mainline] Remove unused UiccController object"
...
am: e29ca94af4
2019-12-24 19:03:25 -08:00
Treehugger Robot
e29ca94af4
Merge "[Mainline] Remove unused UiccController object"
2019-12-25 02:54:20 +00:00
changbetty
b7c8404317
[Mainline] Remove unused UiccController object
...
Bug: 146842199
Test: make
Change-Id: I35f86ee24c0db2599924fb470537b860c9d08390
2019-12-25 02:50:01 +00:00
Automerger Merge Worker
7f659062a5
Merge "[Setting] Use @SystemApi to replace the hidden api" am: e74208c831 am: 7ec7514f1e
...
Change-Id: I9779621d46ba83975bcd552b7b36939d934110bf
2019-12-24 11:15:42 +00:00
Zoey Chen
7ec7514f1e
Merge "[Setting] Use @SystemApi to replace the hidden api"
...
am: e74208c831
2019-12-24 03:02:23 -08:00
Zoey Chen
e74208c831
Merge "[Setting] Use @SystemApi to replace the hidden api"
2019-12-24 10:58:34 +00:00
Automerger Merge Worker
857267b1e8
Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76
...
Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d
2019-12-24 09:14:23 +00:00
SongFerng Wang
27c52d5e76
Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs"
...
am: 6bba42fb40
2019-12-24 01:01:53 -08:00
SongFerng Wang
6bba42fb40
Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs"
2019-12-24 08:59:48 +00:00
android-build-team Robot
0e5a27d4d4
Snap for 6095135 from 462eac2c56 to qt-qpr2-release
...
Change-Id: Iecb14185bbe017e6102faacb22be8bcf9b011b48
2019-12-24 02:08:40 +00:00
Automerger Merge Worker
9695d6f4d6
[automerger skipped] Import translations. DO NOT MERGE am: 462eac2c56 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iae76ed3482f427546053de7a57fcb12806c360f1
2019-12-23 16:39:50 +00:00
