Commit Graph

54924 Commits

Author SHA1 Message Date
Bonian Chen
493dbc7aa7 [Setting] Code cleanup
Remove unused code.

Bug: 146309503
Test: build pass
Change-Id: I272ef1fa82877c8ac6b580fadd8d9baf1da2d5d4
2019-12-16 10:53:11 +08:00
Bonian Chen
487c94c11a Merge "Revert "[Setting] Cleanup Unused SimSettings"" 2019-12-14 01:01:38 +00:00
Bonian Chen
0aac2dfab6 Merge "[RadioInfo] Remove from Settings (into Telephony)" 2019-12-14 00:44:43 +00:00
Pinyao Ting
e6c023bed4 Revert "[Setting] Cleanup Unused SimSettings"
This reverts commit 0d9d341932.

Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission

Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
2019-12-13 23:44:06 +00:00
Bonian Chen
64b5882f9e Merge "[Setting] Cleanup Unused SimSettings" 2019-12-13 17:35:59 +00:00
Bonian Chen
0d9d341932 [Setting] Cleanup Unused SimSettings
There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: Ic55161ab47ae8673caf774cc49914f3741569fab
Merged-In: I3f50e528eb409215371a125184502d3531bad0a8
2019-12-13 13:46:07 +00:00
Bonian Chen
5fb5d21b2d Merge "[Settings] Avoid access Controller from Slice" 2019-12-13 08:07:27 +00:00
Bonian Chen
be5216cacb [RadioInfo] Remove from Settings (into Telephony)
Moving RadioInfo and BandMode to Telephony app.

Bug: 123598192
Test: Manual test
Change-Id: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-13 07:17:53 +00:00
Bonian Chen
9d49e1b51f [Settings] Avoid access Controller from Slice
AirplaneModePreferenceController is designed to be run in UI thread.
However, MobileDataSlice is designed to be run in SliceProvider.

Accessing AirplaneModePreferenceController within SliceProvider which
create a possibility of crash.

Bug: 145689275
Test: manual
Change-Id: Ic9eee407917a94c7247feb3afc709d4642cd9900
2019-12-13 13:34:12 +08:00
Treehugger Robot
ff44a78145 Merge "Update Bluetooth api" 2019-12-13 00:25:13 +00:00
Treehugger Robot
30a4d24f03 Merge "Remove calls to APIs no longer being supported" 2019-12-12 21:13:46 +00:00
Treehugger Robot
ae675ff282 Merge "Use TelephonyManager API to check if device is voice capable." 2019-12-12 16:48:01 +00:00
SongFerng Wang
953ab80e0b Merge "Mainline use cellSignalStrength instead" 2019-12-12 10:01:20 +00:00
SongFerngWang
54b00d859b Mainline use cellSignalStrength instead
Bug: 146046311
Test: 1. open SIM status and check signal strength. (PASS)
2.atest make RunSettingsRoboTests /
ROBOTEST_FILTER=SimStatusDialogControllerTest(PASS)

Change-Id: I93e9dc09a01aa76b7d26660a32944df79cda93f3
Merged-In: I93e9dc09a01aa76b7d26660a32944df79cda93f3
2019-12-12 16:15:21 +08:00
hughchen
ee03851604 Update Bluetooth api
This CL is used to update Bluetooth api.

- Use BluetoothProfile.CONNECTION_POLICY_ALLOWED instead of
  BluetoothProfile.PRIORITY_ON
- Use BluetoothProfile.CONNECTION_POLICY_FORBIDDEN instead of
  BluetoothProfile.PRIORITY_OFF

Fixes: 141582844
Test: manually
Change-Id: I527813e38583a4e4a1489090e8a17c6bd50c3e81
Merged-In: I527813e38583a4e4a1489090e8a17c6bd50c3e81
2019-12-12 10:29:45 +08:00
Michele
37b5425c0f Use TelephonyManager API to check if device is voice capable.
Bug: 146076829
Test: make
Change-Id: I28b708a5838054ec1baa0a086e5e2f6ccc9c0614
2019-12-11 14:54:14 -08:00
Rahul Sabnis
9348f31126 Remove calls to APIs no longer being supported
Bug: 143245666
Test: Manual
Change-Id: Ibec2c9d60ec5c90e9e4f0a03b75c54164f50f42d
2019-12-09 16:08:29 -08:00
Treehugger Robot
ada1f6b10b Merge "Remove DEVICE_OUT_ALL_SCO." 2019-12-06 17:26:20 +00:00
jiabin
70858ea40b Remove DEVICE_OUT_ALL_SCO.
Due to the refactor of audio device type, DEVICE_OUT_ALL_SCO has been
removed. Use DEVICE_OUT_BLUETOOTH_SCO_HEADSET for the test instead.

Bug: 135621476
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest"
Change-Id: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
Merged-In: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
2019-12-05 15:32:32 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Neil Fuller
5da6521458 Merge "Switch settings to use TimeDetector" 2019-12-05 17:05:05 +00:00
Anna Trostanetski
fdb5a1ce2a Merge "Add descriptions to compat changes." 2019-12-05 12:22:27 +00:00
Treehugger Robot
2dbc2db581 Merge "Fix cannot see "see more" button in UI" 2019-12-05 04:17:42 +00:00
Raff Tsai
28a6bcc729 Fix cannot see "see more" button in UI
Bug: 144546394
Test: Cts test
android.provider.cts.SettingsPanelTest#volumePanel_seeMoreButton_launchesIntoSettings

Change-Id: I786d62937e93abdaf96f89b03669302159d571a1
2019-12-05 11:09:49 +08:00
atrost
edd75ce519 Add descriptions to compat changes.
Capture the comment above a definition of a compat change and make it
the description.
Next: make sure existing changes use supported format (only /**
comments, only above the annotations), and use in developer UI.

Bug: 144927670
Test: treeHugger
Change-Id: I5f53517751762a637dc6fc0f220b83d84eb3a916
2019-12-04 19:19:57 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 09:16:04 -08:00
Neil Fuller
df086ecb4f Switch settings to use TimeDetector
Switch settings to use TimeZoneDetector when setting the system time
zone rather than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests
Change-Id: I6042093294ba9690d4355bfe1c47d9f88a2b7ac6
2019-12-04 13:43:58 +00:00
Bonian Chen
84a2951a33 Merge "[Settings] Enable support on testing" 2019-12-04 04:32:58 +00:00
Treehugger Robot
bd2174cda1 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:56 +00:00
Bonian Chen
5cf137e0bb [Settings] Enable support on testing
1. Support ActivityScenario
2. Support add Service through ShadowServiceManager

Bug: 140542283
Test: build pass
Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9
2019-12-03 20:06:59 +08:00
Xin Li
b4fe2d062d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
2019-12-02 21:25:19 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector"
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
Neil Fuller
3c794261a5 Switch settings to use TimeDetector
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit 9861696306)
2019-11-27 16:36:59 +00:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
2019-11-27 14:35:07 +01:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call."
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict"
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
bfa1f2979e Merge "Prevent null point exception"
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-26 07:20:30 +00:00
Treehugger Robot
45b03edd00 Merge "Prevent null point exception" 2019-11-26 07:10:47 +00:00
Bonian Chen
1aac3bb569 Merge "[Settings] Fix test case"
am: 9d66571966

Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
2019-11-25 21:43:52 -08:00
Bonian Chen
9d66571966 Merge "[Settings] Fix test case" 2019-11-26 05:32:00 +00:00
Raff Tsai
0e8a45a7f5 Prevent null point exception
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
2019-11-26 12:05:58 +08:00
Bonian Chen
6c25c29464 [Settings] Fix test case
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
2019-11-25 22:28:22 +08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call"
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call.
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
2019-11-25 12:10:03 +05:30