Commit Graph

56273 Commits

Author SHA1 Message Date
Daniel Huang
7664d08e28 Merge "Modify 5G RAT into Bearer field."
am: 79977fadca

Change-Id: Ie14628c1795dbd02393ef901a0fd7a699a9eba93
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

Change-Id: Ia665022e1d3357f68109905f976b84e89f66c045
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

Change-Id: I2d015004494903e791d3cb3a93e8f428798e99db
2019-12-25 20:02:43 -08:00
Bonian Chen
4be4ae6a75 Merge "[Settings] Replace TelephonyManager#from()"
am: 98e6ab358b

Change-Id: I3db67a7e5037ab06ac5146e0367f759245d95246
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

Change-Id: Icacf8c1bc3beee5f9d3db59f448204cc4ed73eb8
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

Change-Id: If091c3ba75733da4cb8c509409c070de7e5c625d
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

Change-Id: I394bc5a8d7d2463244a87ff7defab39c4fd664d5
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
Bill Yi
462eac2c56 Import translations. DO NOT MERGE
Change-Id: I9250823846a5425a974ec9bc49824284a7e79371
Auto-generated-cl: translation import
2019-12-23 02:11:24 -08:00
Automerger Merge Worker
f5b6c700fc Merge "[Settings] Replace Robolectric#setupActivity()" am: 6aee4f9548 am: 69f67d996b
Change-Id: I2b2622c16d23347b8d0a709ea7e1b681e6be7480
2019-12-23 08:16:16 +00:00
Bonian Chen
69f67d996b Merge "[Settings] Replace Robolectric#setupActivity()"
am: 6aee4f9548

Change-Id: I4113d68bb4363dc5c847ab802c0cee16d726e444
2019-12-23 00:02:22 -08:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
2019-12-23 15:44:52 +08:00
Bonian Chen
6aee4f9548 Merge "[Settings] Replace Robolectric#setupActivity()" 2019-12-23 07:38:44 +00:00
Automerger Merge Worker
4af546197b Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449
Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b
2019-12-23 06:22:32 +00:00
Automerger Merge Worker
0988f8cfec Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08 Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs
- telephonymanager set subid by createForSubscriptionId
  -getDataNetworkType(I)
  -getVoiceNetworkType(I)
  -getSimSerialNumber(I)
  -getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController

Bug: 143998492
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER\
      =SimStatusDialogControllerTest

Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
2019-12-23 14:12:56 +08:00
Bonian Chen
0ed7376449 Merge "[Settings] Add owners to support network part"
am: 661f006bb2

Change-Id: I716f8391987f4d1feaf5e2df2d176d82236c0af9
2019-12-22 22:09:28 -08:00
Bonian Chen
d34e17143f Merge "Retrieve EID from each card"
am: 2f5ad9cb4d

Change-Id: I0a9f6ac304af1be0960adb16d5125de43c9ad4b0
2019-12-22 22:06:32 -08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
2f5ad9cb4d Merge "Retrieve EID from each card" 2019-12-23 05:53:14 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-12-23 12:40:07 +08:00
Automerger Merge Worker
4b7659a1ef Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881
Change-Id: I8ea4f4ec0781ebb28b3aeb0681123d9d1e8ba69b
2019-12-23 03:50:58 +00:00
Zoey Chen
c9e4e0b881 Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API"
am: 990b0527aa

Change-Id: I04c6d51db223bbdbcb18007e77c75103aed150ba
2019-12-22 19:35:11 -08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +00:00
Bonian Chen
6435164abf [Settings] Replace Robolectric#setupActivity()
Avoid from accessing Robolectric#setupActivity().

Bug: 140707056
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I8552b181d2dc1c9a5d8aeb0b7e79bbec7252f67e
2019-12-23 03:08:25 +00:00
Automerger Merge Worker
737783d5e4 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f
Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb
2019-12-23 02:51:48 +00:00
Bonian Chen
fb72a1094f Merge "[Settings] Replace TelephonyManager#from()"
am: 19cebd9eca

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5
2019-12-22 18:42:08 -08:00
Bonian Chen
19cebd9eca Merge "[Settings] Replace TelephonyManager#from()" 2019-12-23 02:40:01 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
2019-12-23 01:00:38 +00:00