Commit Graph

54165 Commits

Author SHA1 Message Date
Treehugger Robot
69a3a68bac Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1 am: cbd5c15f52
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: I1e79c1a41fe73e483b91fd32159bea8f904c4fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 00:24:06 +00:00
Treehugger Robot
cbd5c15f52 Merge changes from topic "fix-b-264712385-primary-module" into main am: 12c4bf6ba1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666399

Change-Id: If404a4284b437523f50e42e8574ecdd51f30dde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 23:41:13 +00:00
Treehugger Robot
12c4bf6ba1 Merge changes from topic "fix-b-264712385-primary-module" into main
* changes:
  audio: Move StreamContext ownership out from StreamCommonImpl
  audio: Use ChildInterface in StreamCommonImpl
  audio: Update StreamAlsa and alsa utils for built-in devices
  audio: Simplify and extend alsa::Mixer
2023-07-20 23:09:50 +00:00
Weilin Xu
bf6bd2d8ef Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: Iaa7cfd3e11d99fa6854423e70421db78817fbd21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 20:43:24 +00:00
Weilin Xu
e065f848d0 Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24133137

Change-Id: I8808c3c3ea0d30914597a5199c15bc3eddc9e723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 19:55:55 +00:00
Eric Biggers
84c5619fc8 Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850 am: d9769b4af6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: I20016292f67b65b4e7093ea479fe80c6f29e95de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:28:03 +00:00
Eric Biggers
6ee7a1e6bc Clarify the Weaver documentation am: a4742a0291 am: cf07ed821d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: I437cdabf4c8e014c27f41dc66500aa10a4508a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:59 +00:00
Devin Moore
90ddb94db2 [automerger skipped] Update weaver AIDL default to use V2 am: 316cf58d49 am: 2965a93c24 -s ours
am skip reason: Merged-In Id6aa9316a20541bf2c9a7cc53345a5010a188d00 with SHA-1 daf12d9440 is already in history

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

Change-Id: Ib467c4542550f4dccccc5c46ffe6341e21e843c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:55 +00:00
ChengYou Ho
b9e3b7556f [automerger skipped] Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae am: 43f1c1af5d -s ours
am skip reason: Merged-In I83897038eda59ed8cae1bdb0ae68828201615ebc with SHA-1 5c3a2b710e is already in history

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

Change-Id: I19bc0b14f56380c7e88d8f43d973f001df6c7495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 18:27:51 +00:00
Eric Biggers
d9769b4af6 Merge changes from topic "weaver-vts-fix" into main am: 2a5366d850
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665203

Change-Id: Ida0015485355ec106c49d91ddbc45cccbcb08684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:28 +00:00
Eric Biggers
cf07ed821d Clarify the Weaver documentation am: a4742a0291
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665198

Change-Id: I241107ae39fe30112f46b33906a09a6824d31e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:26 +00:00
Devin Moore
2965a93c24 Update weaver AIDL default to use V2 am: 316cf58d49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665197

Change-Id: Iaa580ba44e27fc62c4f357a8d9c5f802b2124191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:23 +00:00
ChengYou Ho
43f1c1af5d Add WeaverReadStatus to WeaverReadResponse am: 20c47b4bae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665196

Change-Id: Iedb47e19ff9457b178c34dc469f9a872e30492e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 17:44:20 +00:00
Eric Biggers
2a5366d850 Merge changes from topic "weaver-vts-fix" into main
* changes:
  Don't overwrite in-use Weaver slots during VTS
  Simplify Weaver VTS test
  Remove redundant HIDL Weaver VTS test
  Move VtsHalWeaverTargetTest to common directory
  Make VtsHalWeaverTargetTest test both HIDL and AIDL services
  Clarify the Weaver documentation
  Update weaver AIDL default to use V2
  Add WeaverReadStatus to WeaverReadResponse
2023-07-20 16:53:13 +00:00
Mikhail Naganov
6ddefdbcdf audio: Move StreamContext ownership out from StreamCommonImpl
Upcoming implementations of the streams of the primary module
will need to change the underlying stream type depending on
the current connected device. The stream context must persist,
thus its life time must be bound to the IStreamIn/Out implementation.
Move the StreamContext instance under ownership of StreamIn/Out.

Add StreamCommonImpl::onClose so that the owner of the context
may know when it is safe to reset it.

Re-arrange the order of the arguments when creating a stream
so that the context always comes first.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iaf13d4bc3a53cbfc27264d3abd1f6c417ece3941
2023-07-19 17:49:28 -07:00
Mikhail Naganov
2eabaf995b audio: Use ChildInterface in StreamCommonImpl
Replace the pair of 'shared_ptr<>, Binder' with
the equivalent ChildInterface.

Fix logging of returned sub-objects to print their
Binder value instead of the local pointer.

Bug: 264712385
Test: m
Change-Id: I1350e7b3720c6244cd8527e1d021ee9577399291
2023-07-19 17:36:37 -07:00
Mikhail Naganov
422f7e6b1b audio: Update StreamAlsa and alsa utils for built-in devices
Use new functions added to alsa proxy layer for opening
attached (built-in) devices.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ia2a47ff96fa62f99ce4ec4a0993ca3fd86f82c9d
2023-07-19 17:35:39 -07:00
Mikhail Naganov
f12d4a1ef8 audio: Simplify and extend alsa::Mixer
Remove alsa::MixerControl. tinyALSA contains utility
functions for setting values in percents, they use
the same logic as used to be there for handling
the "volume" control. Use access serialization at
the mixer level, rather than for each control.

Move the call to 'mixer_open' to alsa::Mixer.

Add controls for capture (mic) mute and gain. They
will be used by the primary HAL.

Bug: 264712385
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I0fad994153de96aceec3eb8f2fec19805ec912f8
2023-07-19 17:35:38 -07:00
Max Bires
a7aadcfbb0 Merge "Slight documentation tweak" into main am: fe9355f3c6 am: 514ecb0613
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: Ib71aab2e9d2f87bf79dcc13fc5f3fc21c95fd1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 22:07:39 +00:00
Max Bires
514ecb0613 Merge "Slight documentation tweak" into main am: fe9355f3c6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916

Change-Id: I3e9406f578a4d1c77e8743ee3d06c3b29a3aeec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 21:25:22 +00:00
Max Bires
fe9355f3c6 Merge "Slight documentation tweak" into main 2023-07-19 20:52:56 +00:00
Treehugger Robot
b5d9f4483a Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: I1aeb2f2d0a98f872c8f0b746c72495c3ee591ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 20:40:09 +00:00
Treehugger Robot
1a72ce6fca Merge "Require mapper4" into main am: 1da295ca82
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: Id459a90e232d4459a3ca0f2ff018a8cf81eecb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 19:57:50 +00:00
Weilin Xu
cf892db1ef Fix null pointer crash in AIDL radio HAL VTS
Bug: 277531858
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:978de0a8a4968774e81e10e716a46bd9e1369479)
Merged-In: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
Change-Id: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
2023-07-19 19:46:04 +00:00
Treehugger Robot
1da295ca82 Merge "Require mapper4" into main 2023-07-19 18:20:57 +00:00
Treehugger Robot
14a734402a Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df am: 58445c733c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660420

Change-Id: Ifa280dc21b41b4c14699edc302decc778e04ecc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 18:03:57 +00:00
Shraddha Basantwani
41d85448d0 Audio : Fix minor comments in r_submix module am: 7770c158a1 am: f0506fad7e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2664716

Change-Id: I4e38aad49e548070af5ba498c6426a8e01482097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 18:03:21 +00:00
Treehugger Robot
58445c733c Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660420

Change-Id: I4c8a13e0e874ae369295456bd3e7cc401c4a6e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 17:23:14 +00:00
Shraddha Basantwani
f0506fad7e Audio : Fix minor comments in r_submix module am: 7770c158a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2664716

Change-Id: Ibae793a178e5ff3243a3d3db57672b60af1b2c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 17:22:31 +00:00
Treehugger Robot
c081fa39df Merge changes I88ee8d2f,Id15ecc7f into main
* changes:
  Let the lazy CAS HAL to override the regular one
  Unmark executable bits from CAS AIDL HAL impl
2023-07-19 17:06:00 +00:00
Eric Biggers
31380e7bc9 Don't overwrite in-use Weaver slots during VTS
VtsHalWeaverTargetTest always overwrote the first and last Weaver slots.
Before Android 14, apparently this didn't cause problems because Android
didn't use Weaver for users that never had an LSKF set.  However, now
users get a Weaver slot right away.  That typically means that the first
Weaver slot will be used by user 0.

Fix the test to read /metadata/password_slots/slot_map to determine
which slots are in use by the system, and only write to unused slots.

Bug: 291284381
Test: 'atest -v VtsHalWeaverTargetTest'.  Checked for INFO messages
      showing that slots 1 and 63 were used by the test.  Then rebooted
      and verified that the device can still be unlocked.
Change-Id: Id2cce4240d68999471e7d1e8fc7a8449587eed97
2023-07-19 15:59:10 +00:00
John Reck
34412e26a6 Require mapper4
Bug: 280901110
Test: make

Change-Id: I49fa786957716d896b5476eac32b4c6d9077fe80
2023-07-19 11:29:56 -04:00
Shraddha Basantwani
7770c158a1 Audio : Fix minor comments in r_submix module
Add missing check for StandbyTransition variable
Add missing & in const arguments

Bug: 286914845
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id7a30e0697da80a272768bbf2aa8e3ed748e93f4
2023-07-19 16:43:50 +05:30
Eric Biggers
fdd3ec404b Merge "Update OWNERS for Weaver" into main am: ac5fe6e8e8 am: 27c45b7678
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2662577

Change-Id: I46aa99feeaf9815545ad9ac63e28950687609ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 05:27:41 +00:00
Eric Biggers
27c45b7678 Merge "Update OWNERS for Weaver" into main am: ac5fe6e8e8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2662577

Change-Id: I54f8c08a30ef063de550594e51dba56ee958cc76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 04:23:10 +00:00
Eric Biggers
961a138e47 Simplify Weaver VTS test
- Get the config in SetUp() so that it's easily available to test cases.
- Rename "weaver" class member to "weaver_" to match coding style.
- Eliminate unnecessary variables when checking WeaverReadResponse.
- Fix a typo.

Bug: 291284381
Test: 'atest VtsHalWeaverTargetTest' on bramble
Change-Id: Ia6dca996103057bfdc9002bc9ab2c039e2333ed9
2023-07-19 04:09:01 +00:00
Eric Biggers
e2e40d69a6 Remove redundant HIDL Weaver VTS test
Now that there is a single Weaver VTS test that covers both the HIDL and
AIDL services (weaver/vts/), the HIDL-specific test can be deleted.

Bug: 291284381
Test: 'atest VtsHalWeaverTargetTest' on bramble
Change-Id: Ie942825c154e6792e6ffdbf0c59248de9de10d92
2023-07-19 04:09:01 +00:00
Eric Biggers
f0d6907d20 Move VtsHalWeaverTargetTest to common directory
Since VtsHalWeaverTargetTest now handles both AIDL and HIDL, move it
from weaver/aidl/vts/ to weaver/vts/.

Bug: 291284381
Test: 'atest VtsHalWeaverTargetTest' on bramble
Change-Id: Icfa0ff3b22b036110df327674fda44820057aabd
2023-07-19 04:09:01 +00:00
Eric Biggers
b59654f239 Make VtsHalWeaverTargetTest test both HIDL and AIDL services
VtsHalWeaverTargetTest and VtsHalWeaverV1_0TargetTest are identical
except for whether they use AIDL or HIDL.  Unfortunately, the HIDL test
is needed for several more years.  For now, we have to make some
substantial fixes to both tests.  To make continued maintenance of this
test easier, update VtsHalWeaverTargetTest to handle both AIDL and HIDL.
The test cases are still written in terms of the AIDL API, so it should
still be straightforward to remove HIDL support when the time comes.

Bug: 291284381
Test: 'atest VtsHalWeaverTargetTest' on bramble
Change-Id: I6b760930146ad1b08f17ef810a86c0058601c3bf
2023-07-19 04:09:01 +00:00
Eric Biggers
a4742a0291 Clarify the Weaver documentation
- Explicitly mention that Weaver is for *persistent* storage
- Explicitly mention secure deletion requirement

Change-Id: I3eaf7408570ff20c69a21398e39e16be97d2a917
(cherry picked from commit acd066c614)
Merged-In: I3eaf7408570ff20c69a21398e39e16be97d2a917
2023-07-19 04:08:57 +00:00
Devin Moore
316cf58d49 Update weaver AIDL default to use V2
Test: VtsHalWeaverTargetTest
Bug: 259556049
Change-Id: Id6aa9316a20541bf2c9a7cc53345a5010a188d00
(cherry picked from commit daf12d9440)
Merged-In: Id6aa9316a20541bf2c9a7cc53345a5010a188d00
2023-07-19 04:08:53 +00:00
ChengYou Ho
20c47b4bae Add WeaverReadStatus to WeaverReadResponse
Bug: 259556049
Change-Id: I83897038eda59ed8cae1bdb0ae68828201615ebc
(cherry picked from commit 5c3a2b710e)
Merged-In: I83897038eda59ed8cae1bdb0ae68828201615ebc
2023-07-19 04:08:48 +00:00
Eric Biggers
ac5fe6e8e8 Merge "Update OWNERS for Weaver" into main 2023-07-19 03:39:02 +00:00
Eric Biggers
f4483a2ce9 Update OWNERS for Weaver
Weaver does not have a clear owner, but list the people who seem to be
most involved with it currently.

Bug: 291284381
Test: N/A
Change-Id: I69de46f8154bf91272a7197ce71c13c745a7208e
2023-07-19 03:30:56 +00:00
Max Bires
5c0f7234b6 Slight documentation tweak
Specify that DICE-based RKP implementations may also allow a ROM
extension to manage the UDS public key.

Test: The words are semantically parseable
Change-Id: I8f9c6efb01fc76318220cf1bc4a0eb3a3ad42f87
2023-07-18 20:26:33 -07:00
Jin Chen
d6ec8e593e Merge "[uwb](hal) Add radar data packet format" into main am: 886eb1f6ef am: 06885fbce6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2657455

Change-Id: Icbcd09b026eecc988e56b8c666382ee68ff31593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:07:12 +00:00
Jin Chen
06885fbce6 Merge "[uwb](hal) Add radar data packet format" into main am: 886eb1f6ef
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2657455

Change-Id: I3c8658866b8463d3bb9cbd415c730ebbe781f775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:47:50 +00:00
Treehugger Robot
5c5728b315 Merge "audio: Fix state machine initial and final state symbols" into main am: 1829d2133f am: ee3ebccd56
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663915

Change-Id: I48c4fb28c3426a8f6cafa81aef4e4295198082a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:46:37 +00:00
Shunkai Yao
ce48efbd11 Update effect AIDL state machine graph am: a8c5e014db am: bcd00246c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663775

Change-Id: I40826c93b09817357e5bf39ae0b7f8114a28538a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:44:32 +00:00
Jin Chen
886eb1f6ef Merge "[uwb](hal) Add radar data packet format" into main 2023-07-18 23:27:39 +00:00