Commit Graph

55055 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Ilya Matyukhin
fd493b221a Merge "Use floats for face enrollment dimensions"
am: 59baff6ef9

Change-Id: I36f7d8bb13e6eb14c76d0a87dcb1db1a48819c17
2019-12-19 19:01:55 -08:00
Treehugger Robot
59baff6ef9 Merge "Use floats for face enrollment dimensions" 2019-12-20 02:35:40 +00:00
Ilya Matyukhin
ad1b76ce3b Use floats for face enrollment dimensions
Test: compiles and runs correctly on a device
Change-Id: I64cb905b06aa2ca2b0703d83ed9a495c7a85cf94
2019-12-19 17:21:04 -08:00
Daniel Huang
3350d4d05d Merge "Add 5G RAT into Bearer field."
am: 5f6a4b1dae

Change-Id: I1921fa9611b2222228667bd55e6ac4df5b19a83a
2019-12-19 04:08:08 -08:00
zoey chen
d7eb8113c7 [Settings] Remove usage of TelephonyManager getDefault() hidden API
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
Mergde-In: I818848b0ae323efe8b890cde9d9819d9a606f96d
2019-12-19 19:45:59 +08:00
Daniel Huang
5f6a4b1dae Merge "Add 5G RAT into Bearer field." 2019-12-19 11:24:41 +00:00
danielwbhuang
db59528d84 Add 5G RAT into Bearer field.
Within APN editor, 5G RAT need to be added into Bearer field.

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: If09afd00cf7860c3bbb40be748ca04c9a55ee5b8
2019-12-19 17:17:10 +08:00
Raff Tsai
3999464409 Merge "Fixes sound panel create multiple SoundSettings activity"
am: e45a8aadd4

Change-Id: I20e5dd44471df7a25bd50e0bafdf040cf9b04134
2019-12-18 04:09:49 -08:00
Treehugger Robot
e45a8aadd4 Merge "Fixes sound panel create multiple SoundSettings activity" 2019-12-18 12:08:11 +00:00
Raff Tsai
a9e7517f2c Fixes sound panel create multiple SoundSettings activity
- Use FLAG_ACTIVITY_NEW_TASK to prevent activity stack contains
many activites

Fixes: 142231489
Test: 1. Press volume button and click in volume settings button
      2. Press Media Volume to open SoundSettings
      3. Repeat 1, Press Call Volume to open SoundSettings
      4. Repeat 1, Press Alarm Volume to open SoundSettings
      5. Press back, should see volume panel
Change-Id: I87cd75fbd43f77446191ad50ed7a002a2202337f
2019-12-18 18:38:37 +08:00
zoey chen
7ab984b603 [Setting] Use @SystemApi to replace the hidden api
Bug: 145785535
Test: make
Change-Id: I32554eec8e9f0477a7342a8137a32939b5393fad
Merged-In: I32554eec8e9f0477a7342a8137a32939b5393fad
2019-12-18 17:41:02 +08:00
Bonian Chen
73e6ec3231 Merge "[Settings] Create a proxy for SubscriptionManager"
am: b2380eaaee

Change-Id: Ib66ad2735d01dc3f918ffbd133fcbe5d006bb85f
2019-12-18 01:07:43 -08:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
Yoshiaki Naka
81dbc00b6e Retrieve EID from each card
Each eUICC has its own EID. The same EID retrieved from the default
eUICC shall not be displayed for all the SIM status dialogs when the
device supports multiple UICCs.

Bug: 141256483
Test: Manual and SimStatusDialogControllerTest

Change-Id: I367ae3a5f97ff92e03312bed6fe37727ae3798ab
2019-12-18 17:57:47 +09:00
SongFerng Wang
2be27a8d81 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech"
am: ecce39622d

Change-Id: I4eb6b4e980a13b5b6fc164b7f7edbd7b9fb059d3
2019-12-17 17:41:21 -08:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00:00
SongFerngWang
c13da87416 [mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1e9eeab9d886a2910c7db8b59cfe267c51c5920c
Merged-In: I1600a96a729fc3b555eab5bc80b069663c8eb00a
2019-12-17 12:19:52 +00:00
Raff Tsai
9bb1c631ae Merge "Fix volume slider color is not correct"
am: d1489d2f1f

Change-Id: I6d638ec272cfac5be07e817bbac8c287896fdc4d
2019-12-17 01:04:45 -08:00
Raff Tsai
d1489d2f1f Merge "Fix volume slider color is not correct" 2019-12-17 08:46:46 +00:00