Commit Graph

3778 Commits

Author SHA1 Message Date
SongFerng Wang
68c5ddf8df Merge "[LE Broadcast]Fix the crash in the BluetoothLeBroadcast constructor" into tm-qpr-dev am: 5fa44874ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993858

Change-Id: I31b4243bdcc3c1bf39f8a296e6910b23b048ab38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:31:46 +00:00
SongFerng Wang
5fa44874ba Merge "[LE Broadcast]Fix the crash in the BluetoothLeBroadcast constructor" into tm-qpr-dev 2022-09-21 14:15:31 +00:00
SongFerngWang
50f8f639df [LE Broadcast]Fix the crash in the BluetoothLeBroadcast constructor
The onServiceConnected is called, but the constructor is not finished.

Bug: 247058040
Test: build pass. local test and don't encounter the crash
Change-Id: I806446a893fd3ca18ee926b0bc7d2ceed2717902
2022-09-21 14:50:58 +08:00
Angela Wang
03df43ac45 Merge "Logs hearing aid information when a hearing aid is bonded(connected)" into tm-qpr-dev am: 1d073c9600
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19948969

Change-Id: Iee2d5271637fd382c51092699bd40c25cce4a9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 01:17:51 +00:00
Angela Wang
1d073c9600 Merge "Logs hearing aid information when a hearing aid is bonded(connected)" into tm-qpr-dev 2022-09-17 01:00:19 +00:00
Caitlin Shkuratov
7eb41a4aab Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev am: 33c9d7b2d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969290

Change-Id: If70964d872663ecd340cdb4db332eee524051cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 14:11:46 +00:00
Caitlin Shkuratov
33c9d7b2d2 Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev 2022-09-16 14:06:14 +00:00
Angela Wang
3d023f4a3b Logs hearing aid information when a hearing aid is bonded(connected)
The information including device mode, device side, and entry page id where binding process starts. We only log the info once after the hearing aid is bonded. Without forgetting the bluetooth device, it won't log the info again if you disconnect and then reconnect it.

Bug: 237344016
Test: m statsd_testdrive & statsd_testdrive 513
Change-Id: I57a17fd3a6b26855615ab8698c7d3a95e8438603
Merged-In: I57a17fd3a6b26855615ab8698c7d3a95e8438603
2022-09-15 22:40:50 +00:00
Caitlin Shkuratov
2feb092f75 [Bluetooth] Convert BluetoothController logs to log buffer so we'll
always have them.

We're mainly interested in the activeDeviceChanged log for b/243755182
but it'll be good to have all the logs.

This is almost the same as Id1b12dbf802cae07120f1d6cc2c0b2e3967a1c75,
but with these changes:
 - In BluetoothControllerImpl#onActiveDeviceChanged, check for null
 - Add @NonNull or @Nullable annotations to BluetoothCallback
 - Add a test case for #onActiveDeviceChanged with a null device

Bug: 246876230
Bug: 243755182
Fixes: 234774643
Test: dumped log buffer from device after connecting + disconnecting
bluetooth devices
Test: BluetoothControllerImplTest

Change-Id: I8643bd0061559c3cfc90f0741de12949be3f68f2
2022-09-15 18:19:51 +00:00
Myles Watson
d5078d231e Merge "Revert "[Bluetooth] Convert BluetoothController logs to log buffer"" into tm-qpr-dev am: 7bfcb53d29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19960731

Change-Id: I265ea3302c58da059b6d10567c5d1c7798ca7a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 13:54:42 +00:00
Myles Watson
7bfcb53d29 Merge "Revert "[Bluetooth] Convert BluetoothController logs to log buffer"" into tm-qpr-dev 2022-09-15 13:36:11 +00:00
William Escande
297a766b23 Revert "[Bluetooth] Convert BluetoothController logs to log buffer"
This reverts commit 2d0a8f3b06.

Reason for revert: b/246876230 

It looks like the log are not working because the device can be null. This mean the log never worked before too.

Change-Id: Ia786886420db3dbcdb31e4f1a641088b2fedf897
2022-09-15 04:37:19 +00:00
Caitlin Shkuratov
1c768ba337 Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev am: 390a963bd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19910395

Change-Id: Ibd2a18ff4046ad16eb71ebf8b35f0ef97140756f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 18:11:59 +00:00
Caitlin Shkuratov
390a963bd2 Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev 2022-09-14 18:07:05 +00:00
Shaowei Shen
e2ed860b8e Merge "[Output Switcher] Improvement for seekbar volume control" into tm-qpr-dev am: 1d04b19658
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19821077

Change-Id: I78638b389845759439e1b9820aef0e828a0a7912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 09:50:03 +00:00
Shaowei Shen
1d04b19658 Merge "[Output Switcher] Improvement for seekbar volume control" into tm-qpr-dev 2022-09-14 09:27:12 +00:00
SongFerng Wang
2ef9f04680 Merge "[LE boradcast] save the data into ContentProvider" into tm-qpr-dev am: 86125487ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19834071

Change-Id: I5b1e341796db146ca44d7121ccb3a7f5be1e373c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:26:40 +00:00
SongFerng Wang
86125487ca Merge "[LE boradcast] save the data into ContentProvider" into tm-qpr-dev 2022-09-13 20:02:07 +00:00
shaoweishen
eebc3a56bd [Output Switcher] Improvement for seekbar volume control
1. dispatchDataChanged will not build devices again, we need to
   do that to update volume quicker.
2. dismiss dialog only when Media change to pause or stop.

Bug: 243759774
Test: verified on device
Change-Id: I9b93c7e21c899f011418ee51cec3be08c30004fa
2022-09-13 15:51:59 +00:00
Oli Lan
03d3a29614 Merge "Prevent exfiltration of system files via avatar picker." into tm-dev am: 5489aa365f am: 33a08e907c am: 1a4b98ce27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19754655

Change-Id: I2be77545cb74ffdc32e9b9adc5ce4597ee7f5d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 15:07:30 +00:00
Oli Lan
1a4b98ce27 Merge "Prevent exfiltration of system files via avatar picker." into tm-dev am: 5489aa365f am: 33a08e907c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19754655

Change-Id: If8ac10c7073bf7db345118010591da611ee82394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 14:29:41 +00:00
Oli Lan
33a08e907c Merge "Prevent exfiltration of system files via avatar picker." into tm-dev am: 5489aa365f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19754655

Change-Id: Ia0cefeb6938b14976f34559f4b1d3e4cda5c029a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 14:02:46 +00:00
Jason Hsu
7b083c729b Merge "Fix hearing aid appears wrong side after device reboot." into tm-qpr-dev am: bf7c555c2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19903185

Change-Id: Ifee717d914fdd1cc3800c08ea7bafc95482fca9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 06:03:14 +00:00
Jason Hsu
bf7c555c2f Merge "Fix hearing aid appears wrong side after device reboot." into tm-qpr-dev 2022-09-13 05:53:49 +00:00
jasonwshsu
f50efdcd71 Fix hearing aid appears wrong side after device reboot.
Root Cause: Only set deviceSide() and deviceMode() when connection state change.

Solution: Set deviceSide() and deviceMode() together with setHiSyncId()  when HearingAidService connected and addDevice() into CachedBluetoothDevice.

Bug: 243621489
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=HearingAidDeviceManagerTest
Change-Id: Iaa5a00311006c6e6bb9aaf565224627df1c5beaa
2022-09-13 02:53:46 +00:00
SongFerng Wang
56cd23f2b1 Merge "Add more log for analysis" into tm-qpr-dev am: 2de34a740c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19894991

Change-Id: If1215a83e6242e3f6406d3886098d8142a7bcff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:32:17 +00:00
SongFerng Wang
2de34a740c Merge "Add more log for analysis" into tm-qpr-dev 2022-09-13 01:02:35 +00:00
SongFerngWang
e747702879 [LE boradcast] save the data into ContentProvider
The settings and systemUI use the LocalBluetoothLeBroadcast and
they use different sharedPreferences since the context is different.
It causes the data are not consistent.

Solution: Add data into ContentProvider, and listen the data changed
by the ContentObserver.

Bug: 243107842
Test: build pass. manual test in local.
atest SettingsBackupTest
atest SettingsValidatorsTest

Change-Id: I5f8367f3eb8e2dafa2986004dd8540de41409192
Merged-In: I5f8367f3eb8e2dafa2986004dd8540de41409192
2022-09-12 17:19:39 +08:00
Caitlin Shkuratov
2d0a8f3b06 [Bluetooth] Convert BluetoothController logs to log buffer so we'll
always have them.

We're mainly interested in the activeDeviceChanged log for b/243755182
but it'll be good to have all the logs.

Bug: 243755182
Fixes: 234774643
Test: dumped log buffer from device
Test: BluetoothControllerImplTest
Change-Id: Id1b12dbf802cae07120f1d6cc2c0b2e3967a1c75
2022-09-09 19:02:37 +00:00
TreeHugger Robot
c97e893c70 Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 am: 8a0f592d2a am: df6c4b7a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: I014c9a5495f3bbd962a906d185ad800dd2ae3956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 17:53:42 +00:00
TreeHugger Robot
df6c4b7a24 Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 am: 8a0f592d2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: I8d168b0f89cd6cd8658f90c539965dccd0dd2263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 17:38:42 +00:00
TreeHugger Robot
ad8a4a7fff Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8 am: 8a0f592d2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: Id41384d779e36513a04e1f65299007517a58f696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 17:38:41 +00:00
TreeHugger Robot
8a0f592d2a Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev am: 95e397a8b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19436694

Change-Id: I4cb48212ba44da33fbc6a423862e35bc6ca54efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 17:10:07 +00:00
SongFerngWang
0928b5d16e Add more log for analysis
Bug: 245657079
Test: NA. It is log only.
Change-Id: If2c88cff803a8c09e6d44eda87abd127862de5a4
2022-09-08 19:20:46 +08:00
Evan Laird
631008a955 Merge "Create Configuration overrides for MCC/MNC values" into tm-qpr-dev am: ecc498cef7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19802197

Change-Id: Ia13e650511169836270fd42a23e93cf5e8f53297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 17:21:50 +00:00
Evan Laird
ecc498cef7 Merge "Create Configuration overrides for MCC/MNC values" into tm-qpr-dev 2022-09-06 16:56:52 +00:00
SongFerng Wang
96fd9fad38 Merge "Add owner for job handover" into tm-qpr-dev 2022-09-06 04:57:53 +00:00
SongFerng Wang
dd587918a2 Merge "Add owner for job handover" am: a3d5929306 am: 35c2e10af3 am: 24c7423452 am: fc3adb942d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203113

Change-Id: I5135efb1afe56b49b136e4da976ad897de544f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 09:54:35 +00:00
SongFerng Wang
fc3adb942d Merge "Add owner for job handover" am: a3d5929306 am: 35c2e10af3 am: 24c7423452
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203113

Change-Id: I7c0444d19abea3120f24edbed3f3652147eef823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 08:56:14 +00:00
SongFerngWang
322f29670c Add owner for job handover
CP from the AOSP aosp/2203113.

Bug: 244524317
Test: NA
Change-Id: I18e25daa8cc41b692e944cb7c13b4c5582a7270e
Merged-In: I18e25daa8cc41b692e944cb7c13b4c5582a7270e
2022-09-02 07:00:36 +00:00
Evan Laird
acf1eebc40 Create Configuration overrides for MCC/MNC values
SystemUI currently only shows the RAT type indicator for the active
network, which may change. At the same time, the Resources system does
not track the active mobile network, which means that
`context.getResources().getConfiguration()` may return a `Configuration`
object with an incorrect MCC/MNC for the current active subscription.

This CL creates a `MobileContextProvider` class, which will lazily
generate `Context`s with a correctly overridden MCC/MNC, so that
resource overlays properly load individual carrier iconography when the
active data subscription changes.

We also will load each individual mobile icon with the proper context,
in case there is ever a need to show the RAT type indicator for multiple
subscriptions at once.

Lastly, this CL adds a new "mccmnc" arg string to demo mode so that we
can easily validate RAT type indicator overlays.

Test: atest MobileContextProviderTest
Test: use the new `mccmnc` string in sysui demo mode to manually verify
Fixes: 240555502
Change-Id: If1f7d31a46f19f335b9545ca33638786a423ba0d
2022-09-01 17:15:17 -04:00
SongFerngWang
684402fc11 Add owner for job handover
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I18e25daa8cc41b692e944cb7c13b4c5582a7270e
2022-09-01 16:05:37 +08:00
SongFerng Wang
9a9b092b2f Merge "[BT LE unicast] clear the GroupId when user click 'Forget'" into tm-qpr-dev am: fcad8a9b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19739482

Change-Id: I1a53eafb1d4661cb39db0f75112a74ad28d97d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 06:11:14 +00:00
SongFerng Wang
fcad8a9b14 Merge "[BT LE unicast] clear the GroupId when user click 'Forget'" into tm-qpr-dev 2022-08-31 06:02:13 +00:00
shaoweishen
206c2236fa [Output Switcher] Add OWNER file under SettingsLib/media
Ignore-AOSP-First: change under aosp is under reviewing
Test: N/A
Bug: 233033653
Change-Id: I0a0acefcb6f16586efe7c369023aae61ad473507
2022-08-29 02:22:54 +00:00
Oli Lan
b76141eb2b Prevent exfiltration of system files via avatar picker.
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.

The mitigations are:

1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.

2) Only allow a system handler to respond to the CROP intent.

This is a fixed version of ag/17005706, to address b/239513606.

Bug: 187702830
Test: atest AvatarPhotoControllerTest
Change-Id: I21f1b25154dc00a305bdadb96fdf22edff31d9b8
2022-08-26 15:37:12 +01:00
Oli Lan
f18aa11dd5 Revert "Prevent exfiltration of system files via avatar picker."
This reverts commit 1325574d3a.

Reason for revert: regression if multiple crop system crop handlers are present

Test: atest AvatarPhotoControllerTest
Change-Id: I4dac3ac8d27d2b6d664614dcfa9488d2dad7ee7d
2022-08-25 18:10:32 +01:00
SongFerngWang
6093be73aa [BT LE unicast] clear the GroupId when user click 'Forget'
- To clear the groupId after device unpaired.
- switchMemberDeviceContent don't change the member list.

Bug: 240103816
Test: build pass.
[pass] make RunSettingsLibRoboTests -j40 ROBOTEST_FILTER=CachedBluetoothDeviceManagerTest
[psss] make RunSettingsLibRoboTests -j40 ROBOTEST_FILTER=CachedBluetoothDeviceTest

Change-Id: I65dc254f33236fa7fad08a07e56187962700e6c6
2022-08-25 15:37:00 +08:00
Lucas Silva
b0686e0194 Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev am: e16a86cf1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19699462

Change-Id: I95e0810838925833e869ed171bdafdd4b34dfe87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:16:59 +00:00
Lucas Silva
e16a86cf1c Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev 2022-08-24 13:54:16 +00:00