Mikhail Naganov
4991074eba
Merge "audio: Fix connection between alsa_device_profile and _proxy" into main am: f69e0b6795
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2760046
Change-Id: I1203693e0bd17f89326b99b7ff60c4fea75809d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 17:11:27 +00:00
Mikhail Naganov
f69e0b6795
Merge "audio: Fix connection between alsa_device_profile and _proxy" into main
2023-09-25 16:00:00 +00:00
Treehugger Robot
535ac9f544
Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1
am: 6569dc7511
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954
Change-Id: I91829b13ef77fdf8ef43969f8a88891eaf2d66c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 05:34:19 +00:00
Treehugger Robot
6569dc7511
Merge "Updated vehicleManager_fuzzer" into main am: 7761d90af1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2097954
Change-Id: Ic84b53a9c26e671cec114c7fb82a8a23600ea619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 04:34:27 +00:00
Treehugger Robot
7761d90af1
Merge "Updated vehicleManager_fuzzer" into main
2023-09-25 03:21:12 +00:00
Wonsik Kim
0dac42e170
Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f
am: 6590f39160
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2734633
Change-Id: Ifa34f3ce8e0e939d68afeebb6ca4fac02f0e3b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:44:11 +00:00
Wonsik Kim
6590f39160
Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2734633
Change-Id: I9fc9ae4eff412e71b4f4914ab22a1ece8b7a46c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:39:24 +00:00
Wonsik Kim
bea101032f
Merge "media.c2: add apex_available and set minsdk to 31" into main
2023-09-22 22:12:33 +00:00
Ryan Prichard
6187565c08
Merge "Fix nonce uniqueness tests" into main am: 8d333ff410
am: 2abfe4abc7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758146
Change-Id: Iac897ac4eabe18d0e5929e522b60258abfe792b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 21:48:39 +00:00
Ryan Prichard
2abfe4abc7
Merge "Fix nonce uniqueness tests" into main am: 8d333ff410
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758146
Change-Id: Ifc31204eaea700e50e8ac0601fa77911b590b65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:51:37 +00:00
Ryan Prichard
8d333ff410
Merge "Fix nonce uniqueness tests" into main
2023-09-22 19:43:55 +00:00
Treehugger Robot
47566912ef
Merge "audio: Fix Effect worker thread" into main am: 542110eebe
am: b616f1844b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757106
Change-Id: I8cd8ae18ab29e83b3c2dc17ddf89710467e002b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 18:12:56 +00:00
Treehugger Robot
b616f1844b
Merge "audio: Fix Effect worker thread" into main am: 542110eebe
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757106
Change-Id: I61aa81f240dac4184c1600b624b4f8d27756ef6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 17:16:53 +00:00
Treehugger Robot
542110eebe
Merge "audio: Fix Effect worker thread" into main
2023-09-22 16:40:06 +00:00
Treehugger Robot
118c6668e1
Merge "Add dumpstate HAL APEX" into main am: 582a2010d6
am: aa04f14261
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756645
Change-Id: I6d3dce5e302b21fd6d49ecdd5f8ba3ae21973a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 12:48:17 +00:00
Treehugger Robot
aa04f14261
Merge "Add dumpstate HAL APEX" into main am: 582a2010d6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756645
Change-Id: I71df61cc5949a5217bea52cdbadce803f4b30e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 11:48:34 +00:00
Treehugger Robot
582a2010d6
Merge "Add dumpstate HAL APEX" into main
2023-09-22 10:53:55 +00:00
Mikhail Naganov
5d2bfbac33
audio: Fix connection between alsa_device_profile and _proxy
...
alsa_device_proxy keeps a pointer to alsa_device_proxy,
but does not own it. Thus, the lifetime of the proxy must
be no less than of the proxy. In the legacy USB HAL impl
they were stored together (struct alsa_device_info).
Implement an equivalent class (DeviceProxy) in ALSA utils.
Bug: 264712385
Bug: 298712227
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I4e36701752afb3f35664b6f2ad1acda5719be1ea
2023-09-21 17:44:54 -07:00
Ryan Prichard
81bff7712e
Merge "Use std::filesystem when libc++ is new enough" into main am: 37d5948144
am: 608781cfd7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758145
Change-Id: If5d299cad0f657ee4b6bdac460568398946c8462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:22:30 +00:00
Shunkai Yao
e725d180f9
Merge "Effect AIDL: correct some code format" into main am: 697e3f89a7
am: dcfc268767
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757992
Change-Id: I1b1ddc6aedf293832029183bbc2cc758c7a66a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:21:44 +00:00
Ryan Prichard
608781cfd7
Merge "Use std::filesystem when libc++ is new enough" into main am: 37d5948144
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2758145
Change-Id: I6ee358c40c615d29aa7dc6e7bcecbdebc7394327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:16:04 +00:00
Ryan Prichard
37d5948144
Merge "Use std::filesystem when libc++ is new enough" into main
2023-09-21 21:46:57 +00:00
Shunkai Yao
dcfc268767
Merge "Effect AIDL: correct some code format" into main am: 697e3f89a7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757992
Change-Id: Ie617eee8dbf3eda1c2c90d4014d1fe0a0e359d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 21:23:33 +00:00
Shunkai Yao
697e3f89a7
Merge "Effect AIDL: correct some code format" into main
2023-09-21 20:49:14 +00:00
Andrew Scull
44d47323f5
Merge "Select the DICE validation rules based on the VSR" into main am: b484308d5c
am: 68e76934b2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2678076
Change-Id: Ic9d18238b7e350f2aedb550452d4633f727e3fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 20:35:20 +00:00
Treehugger Robot
397045494b
Merge "Don't require UNKNOWN_ERROR" into main am: 606a406750
am: 6375a4ce87
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757927
Change-Id: Ib9c56a03a2ca3495d39f45a3871c83688008054b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 20:34:42 +00:00
Andrew Scull
68e76934b2
Merge "Select the DICE validation rules based on the VSR" into main am: b484308d5c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2678076
Change-Id: I4694e2508d1381537a25e663382563e24221af7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 19:33:43 +00:00
Treehugger Robot
6375a4ce87
Merge "Don't require UNKNOWN_ERROR" into main am: 606a406750
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757927
Change-Id: Iea95e5d2e565bdc4908587e5d07203946d24efbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 19:32:52 +00:00
Andrew Scull
b484308d5c
Merge "Select the DICE validation rules based on the VSR" into main
2023-09-21 18:48:49 +00:00
Treehugger Robot
606a406750
Merge "Don't require UNKNOWN_ERROR" into main
2023-09-21 18:30:15 +00:00
Shunkai Yao
8771cecb99
Effect AIDL: correct some code format
...
Bug: 300735428
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Ic4c925ea14e08418e56ad108468f61b049280f70
2023-09-21 17:58:42 +00:00
Alisher Alikhodjaev
863da398bb
[automerger skipped] Temporary disable one of the transmit checks am: b5cc022359
am: 0b4ac059d6
-s ours
...
am skip reason: Merged-In If727c613e8575802b99604f7242e16cf85fc97a0 with SHA-1 d0ed43bb7e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24817529
Change-Id: I2f3cf6b1349ea027e38b6d571a4a3b96ce928259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 17:39:15 +00:00
Alisher Alikhodjaev
0b4ac059d6
Temporary disable one of the transmit checks am: b5cc022359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24817529
Change-Id: I272cf266e53a577b63111551a94308a5c572e0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 16:44:05 +00:00
Jooyung Han
8bb9aa13e8
Merge "Add bootcontrol HAL APEX" into main am: aefc0473b8
am: d99cf00892
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756126
Change-Id: Ia6d26869800f3830b97a97cca2da52caaae7e961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 04:24:50 +00:00
Jooyung Han
60ea692592
Merge "Add contexthub HAL APEX" into main am: cf81ef375b
am: 1e0aac1ae6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756125
Change-Id: I2d622072b748ba5c6b786dd3fb1cdfac75721291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 04:24:32 +00:00
Jooyung Han
d99cf00892
Merge "Add bootcontrol HAL APEX" into main am: aefc0473b8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756126
Change-Id: I8d1ee84352400f98069e94e2da5d75ce52d352a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 03:27:07 +00:00
Jooyung Han
1e0aac1ae6
Merge "Add contexthub HAL APEX" into main am: cf81ef375b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2756125
Change-Id: I2380bd8e87d15f08f31bd1a7025bf4a7328848db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 03:26:44 +00:00
Jaideep Sharma
632b1cd048
audio: Fix Effect worker thread
...
When a effect is closed and reopened from framework,
mExit and mStop states are not reset,that causes
threadloop to exit and eventually blocks framework
as FMQs are never filled from effects HAL.
Reset the state of mExit and mStop on every time when
thread is created, so open->close->open kind of
scenarios can be handled.
Bug: 301214647
Test: run vts-hal-audio
Change-Id: If54c8fa62827e5f28e620dd841d638028149b1b8
2023-09-21 03:11:00 +00:00
Jooyung Han
aefc0473b8
Merge "Add bootcontrol HAL APEX" into main
2023-09-21 02:17:32 +00:00
Jooyung Han
cf81ef375b
Merge "Add contexthub HAL APEX" into main
2023-09-21 02:16:51 +00:00
Alisher Alikhodjaev
c3e18f1ef7
Merge "Temporary disable one of the transmit checks" into main am: 59107ad386
am: b872dab9f2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757990
Change-Id: I5a7b4ccec2a1edfdb25983cda1d13e78589d6b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 01:45:03 +00:00
Alisher Alikhodjaev
b872dab9f2
Merge "Temporary disable one of the transmit checks" into main am: 59107ad386
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757990
Change-Id: I7198c95929bb5348cf8dfa800f9981feb77db857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:46:48 +00:00
Alisher Alikhodjaev
b5cc022359
Temporary disable one of the transmit checks
...
The transmit without openning a channel passes on some platforms,
because a basic channel can be opened by external applications
and the state is maintained in the HAL.
Bug: 300502872
Test: run vts -m VtsHalSecureElementTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:d0ed43bb7eeb8c2cdc23d23d0d926e083322b7f3 )
Merged-In: If727c613e8575802b99604f7242e16cf85fc97a0
Change-Id: If727c613e8575802b99604f7242e16cf85fc97a0
2023-09-20 23:41:50 +00:00
Alisher Alikhodjaev
59107ad386
Merge "Temporary disable one of the transmit checks" into main
2023-09-20 23:37:44 +00:00
Wonsik Kim
98faf55896
media.c2: add apex_available and set minsdk to 31
...
Test: m
Change-Id: Id5c266823f99a810cc69b31fff8e8be727c74031
2023-09-20 16:36:18 -07:00
Tri Vo
7b565c4e7b
Don't require UNKNOWN_ERROR
...
Negative test cases should not expect UNKNOWN_ERROR from Keymint since
the exact cause of failure is known.
In general, we should avoid UNKNOWN_ERROR because it makes error
attribution difficult.
To avoid adding retroactive requirements KM implementation, relax the
check to expect any error.
Bug: 298194325
Test: VtsAidlKeyMintTargetTest
Change-Id: I136fb6d36ae92c9e3722ffefe9a067d3515dcbf9
2023-09-20 19:31:48 -04:00
Ryan Prichard
b2c9d5c9a6
Fix nonce uniqueness tests
...
std::unique consolidates the unique nonces at the start of the `nonces`
vector, but it doesn't modify nonces.size(), so these tests weren't
actually verifying that the nonces were unique. Add a vector::erase
call to shrink the vector.
After upgrading libc++, std::unique is [[nodiscard]] and this bug is
a compiler error.
Bug: 175635923
Test: treehugger
Test: m VtsAidlSharedSecretTargetTest VtsHalKeymasterV4_0TargetTest
Change-Id: I7fd8c40a3920bf3a8988c8065503c78ba36dc742
2023-09-20 16:11:35 -07:00
Alisher Alikhodjaev
d0ed43bb7e
Temporary disable one of the transmit checks
...
The transmit without openning a channel passes on some platforms,
because a basic channel can be opened by external applications
and the state is maintained in the HAL.
Bug: 300502872
Test: run vts -m VtsHalSecureElementTargetTest
Change-Id: If727c613e8575802b99604f7242e16cf85fc97a0
2023-09-20 15:15:38 -07:00
Ryan Prichard
680fd80663
Use std::filesystem when libc++ is new enough
...
_LIBCPP_VERSION in external/libcxx is 8000. When _LIBCPP_VERSION is
newer, assume it's the new libc++ toolchain prebuilt, which has a
finalized std::filesystem, and use std::filesystem instead. To make
Soong happy, keep the android.hardware.automotive@libc++fs library for
now but stub out the C++ source files and make the
android::hardware::automotive::filesystem namespace an alias for
std::filesystem.
Bug: 152067309
Bug: 175635923
Test: treehugger
Test: m android.hardware.automotive.can@1.0-service
Test: m android.hardware.automotive@libc++fs
Change-Id: I7aede74cda0122434d972a075d7c7a9933845450
2023-09-20 14:46:18 -07:00
Andrew Scull
908a27ff2c
[automerger skipped] Merge "Add security version to config descriptor" into stage-aosp-udc-ts-dev am: 1c91d9ccdc
am: 9628abbe19
-s ours
...
am skip reason: Merged-In Idb0c991ab12ae75687236f2489e639e4422a0225 with SHA-1 0d520e8e17
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24800994
Change-Id: I52eb33274f8443d9408a02ddc520eadb5406158b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:05:36 +00:00