Commit Graph

350 Commits

Author SHA1 Message Date
Hugh Chen
99000589be Fix broken settings tests
Bug: 214907472
Bug: 214907514
Test: make -j64 RunSettingsRoboTests
Change-Id: If87b1041f2e6357241963240efb5337ab31610bc
2022-01-18 05:50:28 +00:00
Tsung-Mao Fang
99c4cabe14 Ignore broken tests
Test: Run all robo tests
Bug: 214906480
Bug: 214906101
Bug: 214906504
Bug: 214907514
Bug: 214907475
Bug: 214907472
Bug: 214907388
Bug: 214906107
Change-Id: I47dd81ee72f3a55b2f2a30a7a5cb5c68758fbc9a
2022-01-17 18:31:04 +08:00
Evan Chen
ca2d21416d Update bluetooth setting for AssociationInfo
Bug: 205738945
Test: Manually test
Change-Id: Id46b2632abe7b44fe8d0538a4b58e273c913c889
2021-12-23 17:52:01 +00:00
Treehugger Robot
e284e2b311 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956 am: ae62873812
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I6d612fabfa85d826c40185c275c89439e4b08371
2021-12-20 04:02:01 +00:00
Treehugger Robot
ae62873812 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I2c7e0aeb425596f168a08f7c7bec653f5244e12e
2021-12-20 03:44:54 +00:00
Alice Kuo
27a0274d6e Add test case - forceUpdate_deviceIsSubDevice_doNothing
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Treehugger Robot
689086b230 Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e am: 96d33dbdbe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
2021-11-29 04:56:43 +00:00
Treehugger Robot
96d33dbdbe Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
2021-11-29 04:44:02 +00:00
Treehugger Robot
afa860da18 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
2021-11-29 03:04:16 +00:00
Alice Kuo
6943c0356c Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +00:00
Alice Kuo
0d964f7633 Minor clean-up for LE audio setting
Bug: 178981521
Test: build pass
Change-Id: Ica8bd68bea494ee72fa53fbb8f9101dc535470b6
2021-11-29 10:18:47 +08:00
Alice Kuo
3487843496 Update the LE audio device into the media device category
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater

Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
Merged-In: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
2021-11-26 14:02:07 +08:00
Alice Kuo
f57f720c38 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
Sergey Nikolaienkov
7fea5bd54f Fix usage of the updated CDM APIs
Bug: 194301022
Test: make
Change-Id: I70633f43d37fdeec8329e0c58f7cffa402dba689
2021-11-23 13:36:34 +00:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
2021-11-04 04:48:27 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
Hugh Chen
ab3a70cf1e Remove the text for untethered bt device
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
Sergey Nikolaienkov
0a319ece22 Fix usages of renamed Association class
Fix use of the Assocition class, which has been renamed AssociationInfo.

Bug: 194301022
Test: make SettingsRoboTests
Change-Id: I00e3c76c219c36bc8da0dadfb8727d1c217bba18
2021-10-27 09:05:34 +02:00
Alice Kuo
fa0aec49e3 Update the LE audio device into the media device category
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater

Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
2021-10-26 12:12:46 +08:00
Sergey Nikolaienkov
52ab4af51f Use new constructor for CDM's Associations
Bug: 197933995
Test: make SettingsRoboTests
Change-Id: I6097053a9a58128366f5d12b918d3e0721d752f2
2021-10-21 07:53:41 +00:00
Chienyuan
1b9a21ffb5 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf)
2021-10-14 08:47:16 +00:00
Chienyuan
5be9255ddf Remove connection preferences "Files received via Bluetooth"
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
2021-10-09 01:19:00 +08:00
Alice Kuo
02cadb9b32 Add the pairing string for CSIP supported device
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.

Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs

Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
2021-09-18 01:15:51 +08:00
Guojing Yuan
cfbf0b0336 Remove CDM entries in Connected Device.
BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
(cherry picked from commit 11655705db)
2021-08-19 03:21:50 +00:00
Guojing Yuan
11655705db Remove CDM entries in Connected Device.
BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
2021-08-06 23:24:24 +00:00
Jeff Sharkey
7025a83f39 Update to modern Bluetooth permissions.
The Settings app offers several Bluetooth intents, and they need to
be updated to enforce the new "Nearby devices" runtime permission
model, since the old BLUETOOTH and BLUETOOTH_ADMIN permissions have
been deprecated.

Bug: 191174082
Test: TH
Change-Id: I0d812f486bc3dadc517d5b04d3082d4f56f60ef4
2021-06-23 08:53:05 -06:00
Tim Peng
4150049498 Remove flake error for AdvancedBluetoothDetailsHeaderControllerTest
Bug: 188871826
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: If61140213d37b03188cba0c8f49baf3bb9b7f00e
2021-06-02 14:11:34 +08:00
TreeHugger Robot
24f2dda922 Merge "[Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest" into sc-dev 2021-05-24 02:15:08 +00:00
Tim Peng
4d41945d77 [Rohan] fix test failing for AdvancedBluetoothDetailsHeaderControllerTest
-design changes and no battery icon

Bug: 188727945
bug: 188498118
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Ic5ebb3b5c06180090d54cd436c88c0bebe0d79f5
2021-05-22 13:39:25 +00:00
TreeHugger Robot
db6c7211e4 Merge "Update style name" into sc-dev 2021-05-18 11:28:56 +00:00
Wesley.CW Wang
2b6a081a0b Update style name
Bug: 187923403
Test: make SettingsRoboTests
Change-Id: I01455cef919cb8692df9d275c8dff0c68d75861f
2021-05-17 14:02:05 +08:00
Hugh Chen
3eb374adb4 Fix foreground Service background launch restriction
Remove setForeground() in BluetoothPairingService. Refactor
the behavior to not holding service in the background.

Bug: 184901840
Test: make RunSettingsRoboTests -j56
Change-Id: Iaeb96943971f55dbeb3dba4b06b28abe770ba3c2
2021-05-14 08:53:14 +00:00
TreeHugger Robot
5fe34bf7b5 Merge "Fix borken test on Bluetooth and connected package" into sc-dev 2021-05-05 07:36:35 +00:00
Hugh Chen
db53d1c6f8 Fix borken test on Bluetooth and connected package
Bug: 187239965
Test: make RunSettingsRoboTests -j56
Change-Id: Ic0d60a6cd46b1211efb2021f079c0b0a6534b383
2021-05-05 14:31:01 +08:00
Hugh Chen
bb5be240c0 Fix unable to send file via OPP
Bluetooth app will indicate BluetoothOppReceiver to receive
device picker intent. But for fix the security issue we
removed the setClassName() method in ag/14111132 to avoid attack.
It causes BluetoothOppReceiver cannot receive the intent.

This CL will compare to calling package name with launch package name.
If they are not equal, the setClassName() will not invoke.

Bug: 186490534
Bug: 179386960
Bug: 179386068

Test: make RunSettingsRoboTests -j56
Change-Id: Ia51528f2a44ab73edbc86899ca0846d3262fe1f0
2021-04-29 13:53:50 +08:00
Evan Chen
e14cc634dc Merge "Companion Device App showing in Settings" into sc-dev 2021-04-26 18:22:02 +00:00
Eugene Susla
7dc2624b51 Companion Device App showing in Settings
Added a feature that users are able to see/remove the apps' associations
in Settings/Connected devices.
It will display the icon of the associations app, app's name and a button
that users are able to remove the associations. Also it will pop up a
dialog alerting user before remove the associations.

Screenshot:
https://screenshot.googleplex.com/APSRhW2retYmAAK

Bug: 165951651
Test: Manually Test

Change-Id: Iccaeaf516e8a78d4ef33415c1c2d7379139ec88c
2021-04-24 21:31:25 +00:00
TreeHugger Robot
3bcd6bade2 Merge "Use new api to get bluetooth device icon" into sc-dev 2021-04-23 11:59:04 +00:00
TreeHugger Robot
47b254ad88 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev 2021-04-23 09:11:28 +00:00
Hugh Chen
3cf4c3f3a5 Use new api to get bluetooth device icon
This CL use CachedBluetoothDevice#getDrawableWithDescription()
to get bluetooth device icon.

Bug: 178255374
Test: make RunSettingsRoboTests -j56

Change-Id: I45c273e2dd782029da7a3a2724cbca3762cc2d9c
2021-04-20 19:13:34 +08:00
Hugh Chen
8adedc6249 Fix bluetooth settings will broadcast to anywhere when some cases
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.

This CL will not allow to set package name and class name to avoid
the attacker.

Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.

Change-Id: Id27a78091ab578077853b8fbb97a4422cff0a158
2021-04-12 14:10:42 +08:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3)
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
2021-04-07 10:19:10 +00:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan.
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
2021-04-01 15:40:54 +08:00
Hugh Chen
cf2dc5107b Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev 2021-04-01 05:40:21 +00:00
Hugh Chen
802cb176d0 Revert "Fix bluetooth settings will broadcast to anywhere when some cases"
This reverts commit 9d00364da4.

Reason for revert: This fix have a regression, for not blocking b/183344112 revert it.

Change-Id: Ic4366b51e07b43c8d64d2e145563d8a30cb0fc60
2021-04-01 02:24:51 +00:00
tim peng
80f803c337 Merge "Get low battery level through metadata" into sc-dev 2021-03-24 03:27:30 +00:00
Tim Peng
7e6762de8a Get low battery level through metadata
Bug: 183469297
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: Iae8971a5c1f183fe141d4246e23d8feb6d68d0ff
2021-03-24 09:32:26 +08:00
tim peng
28d9db3c86 Merge "Show advanced Bluetooth information in device detail page" into sc-dev 2021-03-15 05:26:45 +00:00
Tim Peng
90df1c9de1 Show advanced Bluetooth information in device detail page
-Apply new metadata on aosp/1596412

Bug: 182338346
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: Ic48ed9213111d0c6ec19b317d4c22e1400261706
2021-03-15 10:16:14 +08:00