Commit graph

65864 commits

Author SHA1 Message Date
Treehugger Robot
4e10251c1d Merge "media.bufferpool2: Ensure uniqueness of connection id" into main am: e540e3385d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3118258

Change-Id: I15540b657902daa97eb6a2027d85f7921f3991f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 18:37:30 +00:00
Treehugger Robot
e540e3385d Merge "media.bufferpool2: Ensure uniqueness of connection id" into main 2024-06-11 18:15:11 +00:00
Sungtak Lee
5e104e41ad media.bufferpool2: Ensure uniqueness of connection id
Currently same connection id can be given to different connections if
they don't belong to the same bufferpool.

Ensure uniqueness of connection id for each connection.

Bug: 323793249
Change-Id: I350872e6d60736ea4525d473944c92b5fe3f5f84
2024-06-10 23:58:13 +00:00
Treehugger Robot
479d8c04df [automerger skipped] Merge "Revert^2 "Remove Vndk_use_version property from AIDL"" into main am: 8cdcadcbe4 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 ec3db82cd0 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115385

Change-Id: Ief1c39fd4a7a3ef42803fabc8a54d3a688e004f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 03:17:09 +00:00
Kiyoung Kim
3e8268bf9a [automerger skipped] Revert^2 "Remove Vndk_use_version property from AIDL" am: 377b466018 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 ec3db82cd0 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115385

Change-Id: Id89b9691143a39cbbb762b7ba132c730c67feed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 03:17:04 +00:00
Treehugger Robot
8cdcadcbe4 Merge "Revert^2 "Remove Vndk_use_version property from AIDL"" into main 2024-06-10 02:31:11 +00:00
Bao Do
85991941ad Remove VTS test for High Quality broadcast am: 7f89d61751
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3119572

Change-Id: I83b33a8bf7c5d1443c18b56b1ef16d96ef586e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 13:21:09 +00:00
Bao Do
7f89d61751 Remove VTS test for High Quality broadcast
Not all target device support high quality broadcast config.

Bug: 342672142
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I87508c8deec994defb5653e51e75a00a8efcb873
2024-06-07 16:59:52 +08:00
David Drysdale
d6c3eee059 [automerger skipped] Merge "Delete standard output in VtsAidlKeyMintTargetTest" into android14-tests-dev am: 9d0352bf56 -s ours am: c8452d57a0 -s ours
am skip reason: Merged-In I3d81f7e59b6189fab1b146320263509f2694c11e with SHA-1 ca3ea117ef is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3083274

Change-Id: I23c9dd4fab912732b65e8afae8f56a99bd41bc50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 07:09:38 +00:00
Huang Rui
e2c7e0a8a1 [automerger skipped] Delete standard output in VtsAidlKeyMintTargetTest am: 0cff7329d2 -s ours am: a9a5e3eb45 -s ours
am skip reason: Merged-In I3d81f7e59b6189fab1b146320263509f2694c11e with SHA-1 ca3ea117ef is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3083274

Change-Id: I90e343d341058d01d6856c1a4dabf408c47b2d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 07:09:32 +00:00
David Drysdale
c8452d57a0 [automerger skipped] Merge "Delete standard output in VtsAidlKeyMintTargetTest" into android14-tests-dev am: 9d0352bf56 -s ours
am skip reason: Merged-In I3d81f7e59b6189fab1b146320263509f2694c11e with SHA-1 ca3ea117ef is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3083274

Change-Id: I4f25468d68aae0afba294c83b495460eb241b37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 06:56:24 +00:00
Huang Rui
a9a5e3eb45 [automerger skipped] Delete standard output in VtsAidlKeyMintTargetTest am: 0cff7329d2 -s ours
am skip reason: Merged-In I3d81f7e59b6189fab1b146320263509f2694c11e with SHA-1 ca3ea117ef is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3083274

Change-Id: I9361dc8a42434bbefaf83ad10e91c486e85d0021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 06:56:20 +00:00
David Drysdale
9d0352bf56 Merge "Delete standard output in VtsAidlKeyMintTargetTest" into android14-tests-dev 2024-06-07 06:46:42 +00:00
Myles Watson
3dbf2ea7fb Merge changes I9fd5e4cb,I59872b1a into main am: 66f0636c0e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3114545

Change-Id: I0a504961e3ad350cd69fdbce4c43ccc3a362a41d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 06:00:53 +00:00
Myles Watson
66f0636c0e Merge changes I9fd5e4cb,I59872b1a into main
* changes:
  HCI: Prefer the requested hci_interface
  HCI: Return the interface from EV_INDEX_ADDED
2024-06-07 05:45:36 +00:00
Xin Li
58598dc8a9 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:43 +00:00
Elliott Hughes
df08b5f5f9 Merge "Remove android.hardware.automotive@libc++fs." into main am: c3f1297610
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3116464

Change-Id: Ia02e248cea3f42221ed2525db74f56f51fd34eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 19:06:36 +00:00
Elliott Hughes
c3f1297610 Merge "Remove android.hardware.automotive@libc++fs." into main 2024-06-06 18:52:50 +00:00
Yuyang Huang
d15c47ae40 Merge "Add @VsrTest annotations to CheckApfIsSupported" into main am: 0b32bfcd6c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3116046

Change-Id: Iefdd501cabf6a596e59d019d70531f7f9b6a570a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 14:53:10 +00:00
Yuyang Huang
0b32bfcd6c Merge "Add @VsrTest annotations to CheckApfIsSupported" into main 2024-06-06 14:39:10 +00:00
Yuyang Huang
904cbb7cac Add @VsrTest annotations to CheckApfIsSupported
Bug: 303356901
Test: TH
Change-Id: I9d6e3ddcef042e39df8d91f68747fddcbd705573
2024-06-06 16:28:15 +09:00
Ted Wang
a7942bf9ec Merge "Replace all keys in sendEids" into main am: 20aea225f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3105841

Change-Id: I5a63ad058fd7a1597c3e6a82f06f1c0203a79683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 06:27:08 +00:00
Ted Wang
20aea225f1 Merge "Replace all keys in sendEids" into main 2024-06-06 06:14:38 +00:00
Bao Do
aa1b56973e Merge changes I15075455,I03f322e8 into main am: 1cb6465c10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3109159

Change-Id: I970647e0bdffd9a6f1ebf42c448298fae02bf053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 06:01:00 +00:00
Bao Do
1cb6465c10 Merge changes I15075455,I03f322e8 into main
* changes:
  Additional broadcast config logic for LEA multi-codec
  Additional context matching logic for LEA multi-codec
2024-06-06 05:48:26 +00:00
Xin Li
9c2c02ddef Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: If12d978ee69ee7f087a7e8758513a9c6bacf817f
Change-Id: I65adc22bdfae4793d763db08e65b8a89128c3ce4
2024-06-05 15:18:57 -07:00
Myles Watson
1f0e88bff9 HCI: Prefer the requested hci_interface
Bug: 345058678
Test: mma -j32
      Connect passthrough mode with AAOS
Change-Id: I9fd5e4cba1e14e6260f485f56f473ce506f18437
2024-06-05 13:39:54 -07:00
Myles Watson
f7986f1a31 HCI: Return the interface from EV_INDEX_ADDED
Bug: 345058678
Test: mma -j32
      Connect passthrough mode with AAOS
Change-Id: I59872b1a5f84401c19106ebb0ffe1dbcc72f6aff
2024-06-05 13:39:10 -07:00
Yi Kong
efc4698376 Merge "Add missing include of <mutex>" into main am: 1612fe7f8e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115159

Change-Id: I0cc9717a758177a4e90c2971e58485891ca35a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:46:22 +00:00
Yi Kong
1612fe7f8e Merge "Add missing include of <mutex>" into main 2024-06-05 16:20:38 +00:00
Elliott Hughes
7754532eae Merge "libc++fs is part of libc++ now." into main am: a22a7ccba5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3113941

Change-Id: I2f9688cd5575051ea5f9e61ebe9b634d8c80f2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 13:23:46 +00:00
Elliott Hughes
dccd8f3c2a Remove android.hardware.automotive@libc++fs.
It's no longer used (now libc++fs is part of libc++), and it's
dangerously opting out of the global cpp_std default.

Bug: http://b/344590580
Change-Id: I17648b573600ff2ee1ab45383c7fda7d5bcfc7a2
2024-06-05 13:09:01 +00:00
Elliott Hughes
a22a7ccba5 Merge "libc++fs is part of libc++ now." into main 2024-06-05 13:06:47 +00:00
Bao Do
81092bb791 Additional broadcast config logic for LEA multi-codec
Broadcast settings matching now base on context to
populate configurations

Bug: 306225778
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I150754558ceb74f19888ef63210e2a42b3f00cd8
2024-06-05 19:18:33 +08:00
Ted Wang
fbf30ae2db Replace all keys in sendEids
Bug: 343604097
Test: vts
Change-Id: I3dd03e24384899a9a4eb104ce0c81932b9c6fefc
2024-06-05 08:20:06 +00:00
Kiyoung Kim
377b466018 Revert^2 "Remove Vndk_use_version property from AIDL"
6f88ec9cfe

Change-Id: I7374625caf1d4d54bed7c00d83ca8afb62e1947b
Merged-In: I681cc850341a7dc47416dc81c1da21b687f87b1b
2024-06-05 07:13:06 +00:00
Pechetty Sravani
17c61fa34b [automerger skipped] Merge "Revert "Remove Vndk_use_version property from AIDL"" into main am: b70524066f -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: I637180721cccc1bfffa96a7aa6a7ca038d1ca224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:36:35 +00:00
Pechetty Sravani
ebc4473cae [automerger skipped] Revert "Remove Vndk_use_version property from AIDL" am: 6f88ec9cfe -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3115562

Change-Id: I48e5515130c2582481a3f62279f12b8a73fda5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 05:36:29 +00:00
Pechetty Sravani
b70524066f Merge "Revert "Remove Vndk_use_version property from AIDL"" into main 2024-06-05 05:12:40 +00:00
Pechetty Sravani
6f88ec9cfe Revert "Remove Vndk_use_version property from AIDL"
Revert submission 3102645-no_vndk_aidl

Reason for revert: Droidmonitor triggered revert due to build breakage in b/345063864. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3102645-no_vndk_aidl

Change-Id: Idc33bb7fbad72d18ac46a69639ac81bf554d469f
2024-06-05 03:42:44 +00:00
Treehugger Robot
35efb27670 Merge "Convert system_compatibility_matrix.xml to soong" into main am: bf5b700570
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102739

Change-Id: Id8eeeacbafc7fa9b74a39eb46705a192ce907dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 03:29:00 +00:00
Treehugger Robot
bf5b700570 Merge "Convert system_compatibility_matrix.xml to soong" into main 2024-06-05 03:10:03 +00:00
Treehugger Robot
6e8359dee5 [automerger skipped] Merge "Remove Vndk_use_version property from AIDL" into main am: 1b182103f4 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: Idc8264ad13ba9450905f82db16440e98b5680ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 01:49:53 +00:00
Kiyoung Kim
9f1f9d116d [automerger skipped] Remove Vndk_use_version property from AIDL am: ec3db82cd0 -s ours
am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 7c0d9eb259 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3102643

Change-Id: I6758a6c83c7df115b0c0f3d661e5a26477288cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 01:49:46 +00:00
Treehugger Robot
1b182103f4 Merge "Remove Vndk_use_version property from AIDL" into main 2024-06-05 01:34:48 +00:00
Pirama Arumuga Nainar
1212902aa2 Add missing include of <mutex>
This fixes build failure with clang-r522817

Bug: 322868540
Change-Id: Ie5db4a32bebd137d1ba11213e0d642d85f1f7d1d
Test: m out/soong/.intermediates/hardware/interfaces/automotive/can/1.0/default/tests/fuzzer/automotiveCanV1.0_fuzzer/android_vendor_arm64_armv8-2a_cortex-a55_fuzzer/e560d7b19ebf7276b3e850d3d346dec8/obj/hardware/interfaces/automotive/can/1.0/default/CanBus.o
2024-06-04 23:10:12 +00:00
Elliott Hughes
98eb91c3cb libc++fs is part of libc++ now.
Change-Id: I55a7c77ec09b21375bd3e3187a12383dde7414b0
2024-06-04 17:25:02 +00:00
Bao Do
57861bdd0c Additional context matching logic for LEA multi-codec
When we match with the remote capabilities, we don't filter by
preferred audio context, since they are suggestion.

Instead, we populate settings into 2 separated vector:
- Matched settings with matched preferred context,
- Matched settings,

We then filter by the first vector, then by the second vector.

Bug: 306225778
Test: atest VtsHalBluetoothAudioTargetTest
Change-Id: I03f322e8de509127d218a9de6b41dd39b2ebdcba
2024-06-04 14:00:32 +08:00
David Duarte
ab8f25dbcb Merge "Update to pdl 0.3.0" into main am: cbe01d238c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3110377

Change-Id: I2fe4ced53f8791c894300ba3b35a3a2d3211f135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 00:34:17 +00:00
David Duarte
cbe01d238c Merge "Update to pdl 0.3.0" into main 2024-06-04 00:26:19 +00:00