Commit graph

64162 commits

Author SHA1 Message Date
Shunkai Yao
55fb557a81 Merge "Effect AIDL: remove placeholder effect from default implementation" into main 2024-03-08 20:14:22 +00:00
Seth Moore
fcff3dd6c7 Update docs to use the correct canonicalization reference
Bug: 325906414
Change-Id: I1eb5bc52df4627c713bb2611101e2c3238ac7b9d
2024-03-08 14:10:49 +00:00
Jerry Wong
5dc07d429d audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51 am: ee5066c40d am: b74c11d1c7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: Iaed42974c9da47819dfaedcb0ee35f54ca81ad98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 04:35:05 +00:00
Jerry Wong
b74c11d1c7 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51 am: ee5066c40d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: Id9d1f231d050e7bd1d01b08b7e8874d6e4464fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 04:10:01 +00:00
Jerry Wong
ee5066c40d audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10 am: bd701ebc51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: I86014692bf87fb9529ff1c05d7141c709674c93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 03:48:46 +00:00
Bao Do
4bde669522 Merge "Implement HFP codec provider and test" into main 2024-03-08 03:30:07 +00:00
Bao Do
79dc7d439f Merge "Template and schema of HFP provider info" into main 2024-03-08 03:29:53 +00:00
Jerry Wong
bd701ebc51 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc am: 12b2c93b10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: I629120865fbc3140771352f38b033ddb84bd9d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 03:24:09 +00:00
Jerry Wong
12b2c93b10 audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6) am: 50bf1116fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989191

Change-Id: Ifa60f56a93ed09f1a546989cd8231cb0df97ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 02:39:48 +00:00
Devin Moore
51c2631a95 Merge "Add 202404 FCM to next release config" into main 2024-03-07 23:57:36 +00:00
Shunkai Yao
7a0eb7b7a7 Effect AIDL: remove placeholder effect from default implementation
Bug: 328330990
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: Icf15e349a2ad36eeefa1e3eb46428c04ae164ad1
2024-03-07 21:37:02 +00:00
Shunkai Yao
530235c8dc Revert "Effect AIDL: remove placeholder effect from default implementation"
This reverts commit d0a6d52d6e.

Reason for revert: b/328548875

Change-Id: I240831d8c417ea95e42ab5faa592a57ed97d475c
2024-03-07 20:25:13 +00:00
David Drysdale
1e6a078326 Merge "Reinstate C++ KeyMint impl as default" into main 2024-03-07 12:34:41 +00:00
David Drysdale
764199f2c9 Reinstate C++ KeyMint impl as default
This is a partial revert of aosp/2856649, changeID
Ia450e9a8f2dc530f79e8d74d7ce65f7d67ea129f, because it turns out
that there are Wear devices that are using the default implementation
(but which are not covered by TreeHugger/presubmit).

It restores the C++ implementation for KeyMint as
android.hardware.security.keymint-service, but preserves the Rust
libraries that were moved here in that CL as a subsequent CL
(aosp/2852598) means that Cuttlefish now uses the libraries here.

Test: VtsAidlKeyMintTargetTest on Cuttlefish
Bug: 328251011
Bug: 314513765
Change-Id: Id6f3491144588e418cd6e18e51262fe839bfdf39
2024-03-07 10:33:22 +00:00
Xin Li
c4b2f5b564 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:41:02 +00:00
Mikhail Naganov
b06a492bd9 audio: Preserve 'usecase' for in IModule::setAudioPortConfig
The field AudioPortConfig.ext.mix.usecase is provided by
the client, thus is needs to be treated the same way as
'.handle'.

Bug: 302736184
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I45050e8530cd236f5e582585f583df477fc7ae8a
2024-03-06 16:39:50 -08:00
Treehugger Robot
98aba89413 Merge "media.bufferpool2: ensure message-ids are safe from overflow/underflow" into main 2024-03-06 21:56:13 +00:00
Shunkai Yao
124bdd282f Merge "Effect AIDL: remove placeholder effect from default implementation" into main 2024-03-06 21:43:30 +00:00
Devin Moore
e3a1202176 Add 202404 FCM to next release config
202404 FCM is now frozen and supported internally. Add the 202404 FCM to
all builds to allow freezing 202404 HAL interfaces and serving the new
versions in the next release config.
Create 202504 FCM for people to start working on the 202504 interface
changes. This new file is based on the internal 202504 file.

Merged-In: Ie6d38d27a287e258c30516e0030ad8c931d06432
Test: m
Bug: 328236210
Change-Id: Iaef8117a18441951070816344aecd24fdd4969f4
2024-03-06 21:30:12 +00:00
Shunkai Yao
d0a6d52d6e Effect AIDL: remove placeholder effect from default implementation
Also add two missing test class to postsubmit

Bug: 328330990
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:postsubmit
Change-Id: I9f9b9feda9ca99e6a065e837fa77dc621ad35bb1
2024-03-06 18:48:52 +00:00
Mikhail Naganov
55e0afa49a audio: Fix glitching of remote submix
Align behavior with the HIDL implementation. This helps
to prevent glitches in the scenarios that use remote
submix for sending audio externally: Auto and Cast.

Bug: 322247032
Bug: 327220024
Test: Repro steps in b/327220024#comment14
Change-Id: If2e4ebd7145375a268ee5f0e4ab656bb3748b2fe
Merged-In: If2e4ebd7145375a268ee5f0e4ab656bb3748b2fe
2024-03-06 10:09:16 -08:00
Mikhail Naganov
4120b99ab6 audio: Align HAL buffer size logic with the framework
When the framework uses mixers, it rounds up the buffer
size to the frame count which is a multiple of 16.
In the HIDL implementation, this adjustment was done after
the framework thread was already created, and FMQ was
created on the first transfer, using adjusted size. In
the AIDL implementation, the FMQ is created together with
the stream, using the size suggested by the HAL.

Bug: 321233946
Test: verify audio playback over S/W A2DP
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f2f9ae08c2ee4e396bbe4b8c7e955bad725ce545)
Merged-In: I35a5479bfc87a290aff09d51415381948857a146
Change-Id: I35a5479bfc87a290aff09d51415381948857a146
2024-03-06 10:09:00 -08:00
Mikhail Naganov
46c433aabd audio: Set correct priority for the SPATIALIZER stream thread
To align with the framework, the thread serving SPATIALIZER
stream I/O must use SCHED_FIFO and realtime priority.
The latter can be set via `audio.spatializer.priority`
property.

Bug: 321233946
Test: adb shell ps -Tl -p <HAL PID>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:81a14293f4f26bf3af740cc1682c1111d7e1e29d)
Merged-In: I80107c9aa7d86cbfc2f79c2ad05959fc9f7913f7
Change-Id: I80107c9aa7d86cbfc2f79c2ad05959fc9f7913f7
2024-03-06 10:08:50 -08:00
Xin Li
34cdbc2da7 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I0d6ef15f4b078b5e3a1cfe8db4ea633386089f79
Change-Id: Ic88ffc7158bd55837a2c032897e43c884f067274
2024-03-06 09:30:01 -08:00
Myles Watson
5f03254e65 Merge "Revert^4 "Install bluetooth audio VINTF fragment in apex"" into main 2024-03-06 13:21:08 +00:00
Myles Watson
530248a928 Merge "Revert^3 "Install bluetooth audio VINTF fragment in apex"" into main am: 285f0a8d36
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2989176

Change-Id: I0d6ef15f4b078b5e3a1cfe8db4ea633386089f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 00:36:12 +00:00
Shunkai Yao
1ce6b9ea39 Merge "Visualizer: make the range align with VISUALIZER_CAPTURE_SIZE_*" into main am: 555f439645
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2984320

Change-Id: Ia98ae9f2ef0f21c284623ac2adf8e2c9b84c2c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 00:35:26 +00:00
Jerry Wong
50bf1116fc audio: Add AUDIO_FORMAT_DEFAULT to supported formats (V6)
Bug: 309625094
Test: atest VtsHalAudioV6_0TargetTest

Change-Id: I1f79d33fc05630392587d9a4fb2a3a20a98d6d14
2024-03-05 14:48:57 -08:00
Myles Watson
ddf9a00823 Revert^4 "Install bluetooth audio VINTF fragment in apex"
886bfbed7a

Change-Id: I963bf18d58152fef685fefb2413d2eb7116a3cdb
2024-03-05 22:06:38 +00:00
Myles Watson
285f0a8d36 Merge "Revert^3 "Install bluetooth audio VINTF fragment in apex"" into main 2024-03-05 21:05:50 +00:00
Myles Watson
886bfbed7a Revert^3 "Install bluetooth audio VINTF fragment in apex"
bc0ff1c206

Bug: b/328267880
Change-Id: I1eae6180cd494d70dcf42103c98832442a089725
2024-03-05 19:46:29 +00:00
Shunkai Yao
555f439645 Merge "Visualizer: make the range align with VISUALIZER_CAPTURE_SIZE_*" into main 2024-03-05 17:05:31 +00:00
David Drysdale
dd243e0d08 Merge "KeyMint: add separator for debugging output" into main am: ea20772c42
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2980595

Change-Id: Ie7128c22238b2189b9d5d5fdd89d6a2c44855a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 11:44:24 +00:00
David Drysdale
ea20772c42 Merge "KeyMint: add separator for debugging output" into main 2024-03-05 11:12:38 +00:00
David Drysdale
4d7be1ccce Merge "KeyMint: default to Rust reference implementation" into main am: 695f02607b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2856649

Change-Id: I0c6b82f0aa3aba0bc7bd7ab5d09d6fa5f55d05f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 07:45:31 +00:00
David Drysdale
695f02607b Merge "KeyMint: default to Rust reference implementation" into main 2024-03-05 07:10:05 +00:00
Treehugger Robot
75aed17303 Merge "Effect Aidl: make EffectFactoryHelper methods static only" into main am: 337c6afb98
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2987144

Change-Id: I89f99dba9530216dd8fe6571eed6a3e290461d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 04:49:30 +00:00
Treehugger Robot
337c6afb98 Merge "Effect Aidl: make EffectFactoryHelper methods static only" into main 2024-03-05 03:59:06 +00:00
Treehugger Robot
48fc7fb9ac Merge "Effect Aidl: skipping reopen test for unsupported audio hal" into main am: 4b133e633e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2987138

Change-Id: I5cf1d9fa2b390d7561e541b4fff148832b7bc689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 03:18:43 +00:00
Treehugger Robot
4b133e633e Merge "Effect Aidl: skipping reopen test for unsupported audio hal" into main 2024-03-05 02:57:45 +00:00
Jooyung Han
189a837b6d Revert^2 "Install bluetooth audio VINTF fragment in apex" am: bc0ff1c206
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2955647

Change-Id: Id61c0d4324e535fab38977183eb4aa6b3e3f216d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 02:33:56 +00:00
Shunkai Yao
8a4e9b739f Effect Aidl: make EffectFactoryHelper methods static only
Bug: 327678656
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I57d924d19f38257e32dba95d4de0ca00532c5ab4
2024-03-04 23:28:30 +00:00
Shunkai Yao
9f9fe92911 Effect Aidl: skipping reopen test for unsupported audio hal
Bug: 327678656
Bug: 328009824
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I25a27c780253f84f771148b5c30be57f35dbf39c
2024-03-04 23:01:36 +00:00
David Drysdale
30196cf77c KeyMint: default to Rust reference implementation
Copy code that can be re-used from the Cuttlefish KeyMint
implementation, specifically from the following directories
under device/google/cuttlefish:

- HAL-side code from guest/hals/keymint/rust/
- TA-side code from host/commands/secure_env/rust/

Create a corresponding pair of libkmr_{hal,ta}_nonsecure libraries here.
The only changes to the copied code are:

- Convert `pub(crate)` to `pub` in `attest.rs`.
- Add some missing doc comments.
- Add comment noting need for SELinux permission to read ro.serialno.
- Add comment noting need for clock to be in sync with Gatekeeper.

(A subsequent CL aosp/2852598 adjusts Cuttlefish so that it uses the
copied modules here, and can remove the original copies.)

In addition to the moved code, the default implementation also needs
a new implementation of a monotonic clock, added here in clock.rs
using `std::time::Instant`.

With the new nonsecure HAL and TA libraries in place, implement the
default KeyMint HAL service using the former, and spin up a single
thread running a nonsecure TA using the latter.  Communicate between
the two via a pair of mpsc::channel()s.

Test: VtsAidlKeyMintTargetTest with normal Cuttlefish (all pass)
Test: VtsAidlKeyMintTargetTest with default/nonsecure impl (auth
      tests fail, but this is expected as Gatekeeper hasn't moved)
Bug: 314513765
Change-Id: Ia450e9a8f2dc530f79e8d74d7ce65f7d67ea129f
2024-03-01 07:20:57 +00:00
Shunkai Yao
1332677998 Visualizer: make the range align with VISUALIZER_CAPTURE_SIZE_*
Bug: 317742497
Test: atest android.media.audio.cts.VisualizerTest
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I5b89c9cead9906966b00fcb2fdb16905ed97b263
Merged-In: I5b89c9cead9906966b00fcb2fdb16905ed97b263
2024-02-29 18:46:00 +00:00
Jooyung Han
bc0ff1c206 Revert^2 "Install bluetooth audio VINTF fragment in apex"
e9f8c8c4f5

Change-Id: Ice6a2a50b966d30db2e375e8bad2b58dad3c5018
2024-02-29 13:05:43 +09:00
David Drysdale
f3a4bea6df KeyMint: add separator for debugging output
When dumping attestation certificate chains with the --dump_attestations
option, add a separator between distinct chains to make them easier to
analyze.

Bug: 326564087
Test: VtsAidlKeyMintTargetTest
Change-Id: Ife19edfddef6c8cd26de9f9816c3c9bf65cbb929
2024-02-28 11:32:35 +00:00
David Drysdale
4d8f027e9e KeyMint: use a smaller invalid IMEI value am: 8351f33b2b am: e61433d1e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977372

Change-Id: I05d8aabfe26efc00eb0097a3063ebe5c57e55b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 07:08:18 +00:00
David Drysdale
e61433d1e0 KeyMint: use a smaller invalid IMEI value am: 8351f33b2b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977372

Change-Id: Ifa35dcefaf6d68c229dca79e02a9b2d24bd95287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 06:25:11 +00:00
Sungtak Lee
a60689cd50 media.bufferpool2: ensure message-ids are safe from overflow/underflow
Since message-ids can be wrapped, they are not safe from
overflow/underflow. Change them to be safe from overflow/underflow.

Bug: 321674574
Change-Id: I39a4baf057fc81389925e0fe358894f62ade9423
2024-02-27 21:03:18 +00:00