| commit | 08bc34358b281bb083e1c1f95bc19c634f54ff1e | [log] [tgz] |
|---|---|---|
| author | Kevin F. Haggerty <haggertk@lineageos.org> | Wed May 15 06:29:53 2024 -0600 |
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | Wed May 15 06:30:05 2024 -0600 |
| tree | 5c7bde55e92b01f1f11e249f7199c283c76de4e0 | |
| parent | fc78e09900ca39b8053540f39c359a6ce42ccfbe [diff] | |
| parent | d89dab956e98e39b2d15f5a887c76a0e31c99c9f [diff] |
Merge commit 'd89dab956e98' into staging/lineage-20.0_android-security-13.0.0_r17 * commit 'd89dab956e98': Reapply "AudioService: anonymize Bluetooth MAC addresses" Reapply "Refactor the SADeviceState to AdiDeviceState" Revert "Refactor the SADeviceState to AdiDeviceState" Revert "AudioService: anonymize Bluetooth MAC addresses" Prioritize system toasts Conflicts: services/core/java/com/android/server/clipboard/ClipboardService.java Change-Id: Id50e77ae779316408fed277ceec5266169123939