summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-05Snap for 11180127 from 7f0cf4bd3066eb1e8a69a878174a761655f6d2a1 to ↵aml_mpr_341411070android14-mainline-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I2f5a72ee26eec7e6cf5c5e7cd6ab408a3b76a827
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am: 2d25c9b0b5 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: Ieb2a89645366fda1f90506805cfc329446ee0374 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05[automerger skipped] Merge "Handle screen capture disabled state for ↵Treehugger Robot
multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: If45434a2882db4b44c18254c85daed87c15566e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Handle screen capture disabled state for multiple users" into tm-dev ↵Treehugger Robot
am: 925eb31c07 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: Ia549e18ef0ba278f695d2f3ecae5a4d8b9f97abd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Handle screen capture disabled state for multiple users" into tm-devTreehugger Robot
2023-12-05Handle screen capture disabled state for multiple usersRubin Xu
Before this fix, the framework use one single integer to track screen capture disabled policy across the device. This can be either a real userId, or the symbolic USER_ALL or USER_NULL for all users or no user. This has the problem that it can't represent policies from more than one admin (or policies from both the admin and its parent). In addition, due to the way DevicePolicyManagerService refreshes policies, when a non-managed user is started, its default policy state overrides any existing policy, causing screen capture to be no longer disabled. Fix this by properly tracking the policy for each user in an set. We still use USER_ALL in the set to represent screen capture being disabled for all users. In Android 14, the screen capture logic is migrated to policy engine which already contains this fix. Bug: 305664128 Test: ScreenCaptureDisabledTest Test: FrameworksServicesTests:DevicePolicyManagerTest Test: DevicePolicyManagerServiceMigrationTest Test: MixedDeviceOwnerTest#testScreenCaptureDisabled_assist MixedProfileOwnerTest#testScreenCaptureDisabled_assist MixedManagedProfileOwnerTest#testScreenCaptureDisabled_assist Test: MixedManagedProfileOwnerTest#testScreenCaptureDisabled_assist_allowedPrimaryUser Test: MixedDeviceOwnerTest#testCreateAdminSupportIntent MixedProfileOwnerTest#testCreateAdminSupportIntent MixedManagedProfileOwnerTest#testCreateAdminSupportIntent Merged-In: I9da7b026e937a9e729777b4de613b319a4084418 Change-Id: Ib016b740927003f8bd81992f24c722c29ac723b5
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: de8816c27a -s ours am: cb17c01d1f -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Id394405c9ffea2857b3b336529c9cf0867d6407f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: c645309fa0 -s ours am: 13f052da23 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Ibbee2c4f959672ab21953c1b74d8acf754cf6008 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: de8816c27a -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Ic68743f9bfb4dec5d3c6a6ef9e68cedd7f53db95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: c645309fa0 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Ifbe4cb43af803e4a73324533a2345d7251432210 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I992720c34c6d56ff3cb6e48121ab918f3e5bd603 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Ia9aad9f434afc3785308f049d3c9640ff39ed8bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Iafeb6a986e9953bb1f7fb37c3fa3287ff40f198f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I9e0a0f3a1b8c0efa0b17dfed808c9ad1a619d3e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Ica16e3eea23140977f049ff2b408af98fc463421 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am: 90b514ec38 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: If1f900f07388a293cde60120eae36abd33bbc4c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into ↵Eric Laurent
sc-dev am: 840901500e -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: Idac24a8752875f0063c83ef9ea6cc834fecf1d70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
05abf2ce0a -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25286114 Change-Id: I74e1fdcaa12a4adc1ff38380eedd2378c58031e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge changes from topic "anon_bt_address_sc_dev" into sc-devEric Laurent
* changes: AudioService: anonymize Bluetooth MAC addresses Refactor the SADeviceState to AdiDeviceState
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 44dd043eb2 -s ours am: a4b04d73f4 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I67fabe9d0ef2a3b42d2ce404244dda450d805f96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b7b3df4949 -s ours am: 4984eb4806 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I28fd15b613e8728208224896eb04e63d65f8f56e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 44dd043eb2 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Iff1b8143db8d7bfebf0566967fb855277e3b35b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b7b3df4949 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Id4aee6de64840d2e76d982a42aa4185cb8a547de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Snap for 11171363 from ece808ae4c52a9e5431a73a996ac0de2ab7c5081 to ↵Android Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I2075eb9b91b9b10083e8118e15fdc30dc953fab1
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I282736eca7e27b129ef2ba3f5d329298f312288e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I7d2f0b573a731304d13b6ba40a4e4b4a88f75eef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I6d7bc11bc29d886f74cb65b94e3622c61b64acd1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am: d218e10bf0 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: Idcd97c506f7a1bf2519b068bcb6abea57d129456 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 140a578c08 -s ours am: 6169bb4724 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: Ib78c48a505c9433244850a5b61738a9f640c8f59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am: 1c44942cc4 -s ours am: 4e4812455c -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I9914077105ce79fac7c7b0faaee26b147615884e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" ↵Eric Laurent
into sc-qpr1-dev am: fefdc2b7de -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I5256350dc90a18c7e3d0bc9eac6fc0db7598d10b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
ddf629a3fd -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 787a07d969 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25285859 Change-Id: I2aef6579aac36eaf288ed511abe0284cd719299d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 140a578c08 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: Iceb9e463dea80d221a17cf6d7e93bb16cbb65303 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am: 1c44942cc4 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I4307dcb7592dd9d432eb2cbcbc77715e25041805 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Merge changes from topic "anon_bt_address_sc_qpr1_dev" into sc-qpr1-devEric Laurent
* changes: AudioService: anonymize Bluetooth MAC addresses Refactor the SADeviceState to AdiDeviceState
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I63910b5f611f339751a7306542e63031a83f5709 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am: 0e17ca6913 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I4f695e4c0365bb6b7f02aeb4c7ea3742b141728f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" ↵Eric Laurent
into sc-v2-dev am: 84152b1577 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: Iec696008d417a4101796e8074f827ad55f3cf42a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ↵Eric Laurent
787a07d969 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178 Change-Id: I6d5014ec4669c27e730340587e75ab408ef66ced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Merge changes from topic "anon_bt_address_sc_v2_dev" into sc-v2-devEric Laurent
* changes: AudioService: anonymize Bluetooth MAC addresses Refactor the SADeviceState to AdiDeviceState
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into ↵Eric Laurent
tm-dev am: 47007e641f am: a277b539c1 -s ours am: 83d1991ee5 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c517 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: Iec4f6e4bf0cf12a636b49f17208edd941e1897bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: ↵Vlad Popa
41f08b8d70 am: 43b047027f -s ours am: c78dda6686 -s ours am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 ada3f60412 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: If674032e98ab8f77c9b14ce8304e26456f0f9321 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into ↵Eric Laurent
tm-dev am: 47007e641f am: a277b539c1 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c517 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: If1921b72b7128f7e05ebcc7d03584e661bba667c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: ↵Vlad Popa
41f08b8d70 am: 43b047027f -s ours am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 ada3f60412 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: I78fe3568ceba72cbeb290d9c43ea789f70ac9e74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Merge changes from topic "anon_bt_address_tm_dev" into tm-dev am: 47007e641fEric Laurent
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240035 Change-Id: I32bfab31167e573cd2f993b84282fa052cb3135e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Refactor the SADeviceState to AdiDeviceState am: 41f08b8d70Vlad Popa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Change-Id: I30180521842a10bf3cc049aee17e9a8fdc341060 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-03Merge changes from topic "anon_bt_address_tm_dev" into tm-devEric Laurent
* changes: AudioService: anonymize Bluetooth MAC addresses Refactor the SADeviceState to AdiDeviceState
2023-12-03AudioService: anonymize Bluetooth MAC addressesEric Laurent
Make sure APIs returning AudioDeviceAttributes from AudioService anonymize the Bluetooth MAC addresses because those are considered privacy sensitive. Only expose the full MAC address to system and apps with BLUETOOTH_CONNECT permission. setters, getters and listeners for preferred device for strategy, preferred device for capture preset and mute await connection are modified: - when entering AudioService, full MAC addresses are retrieved based on the known Bluetooth devices stored in AudioDeviceInventory.mDeviceInventory - when exiting AudioService, MAC addresses are anonymized if the client app does not have BLUETOOTH_CONNECT permission or is not a system component APIs based on AudioDeviceInfo do not need to be modified as the AudioDeviceInfo MAC address is for the AudioPort cached in the app process and AudioPorts are anonymized by the native audioserver before being returned to client apps. Bug: 285588444 Test: atest AudioManagerTest Test: atest RoutingTest Test: atest AudioCommunicationDeviceTest Change-Id: I67bbba2ba941c97138a068d640079b17650e3d86 Merged-In: I67bbba2ba941c97138a068d640079b17650e3d86
2023-12-03Refactor the SADeviceState to AdiDeviceStateVlad Popa
The idea is to have a device state catalog for all the known devices. Also refactored the name of the Settings.Secure key entry for persistence. The current code will check the legacy key first, erase it and update the new key. Test: atest SpatializerHelperTest & AudioDeviceBrokerTest Bug: 278265907 Bug: 285588444 Merged-In: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 Change-Id: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3
2023-12-02[automerger skipped] Merge changes from topic "anon_bt_address_tm_qpr_dev" ↵Eric Laurent
into tm-qpr-dev am: f929698156 -s ours am: 42da3822a5 -s ours am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 2ad44bc654 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262181 Change-Id: I1f677bdf210a4a69998b22c6d85397b3868e413d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 04:06:02 +0000