Commit graph

1570 commits

Author SHA1 Message Date
Florian Mayer
b07d73591f Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ie9c89e496eb01c33e714fda2e6baf61c5200062e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:30:18 +00:00
Florian Mayer
4eeda58ce2 Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" 2022-09-28 21:03:20 +00:00
Florian Mayer
0d8a45944f Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."
This reverts commit 40a4639e51.

Reason for revert: Speculative rollback after fix in b/248637663

Bug: 230535046
Change-Id: I72b5242dbc73587004e31305e3b25c13cc7b5827
2022-09-28 00:25:45 +00:00
Chih-hung Hsieh
c5bc4643c8 Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9 am: fa6d674608 am: 5872d55a9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: I85452627831645930befbe6c0115727ad826c4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 09:10:58 +00:00
Chih-hung Hsieh
fa6d674608 Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: I82c6d06ba75e6f1e6c68fb0a4f8751c628a68cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 08:17:27 +00:00
Chih-hung Hsieh
3086bb11c9 Merge "Fix out-of-memory error." am: f4a9ee68a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: Ia916d4d630e56dca34e2dc1572457b621d458540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 07:47:36 +00:00
Chih-hung Hsieh
f4a9ee68a3 Merge "Fix out-of-memory error." 2022-09-27 07:17:21 +00:00
Chih-Hung Hsieh
739fbefe2d Fix out-of-memory error.
Bug: 248637663
Test: atest android.hardware.audio.common@7.0-util_tests android.hardware.audio.common@7.1-util_tests
Change-Id: Ifb41ddc3fbfa8c9db7f3e10cede2155d28d3c8c4
2022-09-24 18:07:38 -07:00
Treehugger Robot
6fc21d49bf Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8 am: 2ad819f77e am: 57d87401e3 am: 1a4b5143a4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: I693d170673e6145d5d31415007bd08362e0775bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:44 +00:00
Shunkai Yao
a1074cfb3b AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96 am: db4ff5da08 am: eb9789c77c am: 60ea774bcb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I62f5c6ced8a8358df6549c1c8a4ddb318d6d2496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:42 +00:00
Shunkai Yao
c446a14f5d AIDL effect: Initial IEffect interface definition am: 84efa03de3 am: 722b7ced39 am: 4ca9eb0ab3 am: e34c028abb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I18bec90a509dc107b0c44dfb431c651818da7d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:17:40 +00:00
Treehugger Robot
57d87401e3 Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8 am: 2ad819f77e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: I69d4f8290c054e39921ec53b4d4f02345f387570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:22 +00:00
Shunkai Yao
eb9789c77c AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96 am: db4ff5da08
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I801025e9b5fdd6b00c14b251ba7bed9ad5808326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:21 +00:00
Shunkai Yao
4ca9eb0ab3 AIDL effect: Initial IEffect interface definition am: 84efa03de3 am: 722b7ced39
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I847d0d96c17120dc21e0ed3186a9bbe8e28a6ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:18:19 +00:00
Treehugger Robot
2ad819f77e Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: Ie8a3f19253af3b876f12ff4eee61d5005b042047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:30 +00:00
Shunkai Yao
db4ff5da08 AIDL effect: Initial IEffect interface implementation and vts test am: 4590517a96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221633

Change-Id: I399fde95f71b4b061406cb68f87f60a5bc0e9ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:28 +00:00
Shunkai Yao
722b7ced39 AIDL effect: Initial IEffect interface definition am: 84efa03de3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221632

Change-Id: I9c18d00acf7fa5c003c506f1d790eb770abad09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 19:51:26 +00:00
Treehugger Robot
955e3896e0 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68 am: cdc677afa4 am: 74693ba072 am: 5c057f6c60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: Idb61ab3949f7cd6cdc15b917591dd6a55db14a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:56:11 +00:00
Shunkai Yao
121c6ddc99 AIDL effect: Refine some implementation and test logic.
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I5a9bb542872de6c5700fa6b14e124e9b9e206da6
2022-09-22 01:36:58 +00:00
Shunkai Yao
4590517a96 AIDL effect: Initial IEffect interface implementation and vts test
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: Id64d28af9122e82acd96e3349cf37c3d9728069a
Change-Id: Id64d28af9122e82acd96e3349cf37c3d9728069a
2022-09-22 01:36:00 +00:00
Shunkai Yao
84efa03de3 AIDL effect: Initial IEffect interface definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: I0d02fed5d40a108003e735d3619e2fc7c0ef6332
Change-Id: I0d02fed5d40a108003e735d3619e2fc7c0ef6332
2022-09-22 00:43:47 +00:00
Treehugger Robot
74693ba072 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68 am: cdc677afa4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: I8780f35257fd34f0cc9f04f91337f7ce698e4b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:17:02 +00:00
Treehugger Robot
cdc677afa4 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: Ifa8f46b6f691b572117f1f6d4b937fc67df52e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:24:43 +00:00
Mikhail Naganov
1cbe492d59 Sync audio_policy_engine_configuration.xsd with the SDK
The audio_policy_engine_configuration.xsd schema was missing
four values for the usage enum. This was causing the VTS
test to fail. These usages must be specified in the audio
policy engine configuration file, otherwise a GTS test fails.

Bug: 245303963
Bug: 246231268
Bug: 246901091
Test: atest VtsHalAudioPolicyV1_0TargetTest
Change-Id: I0161ddb33e52cbca9b425c0cbb4f32f320c43af4
2022-09-21 18:23:06 +00:00
Treehugger Robot
17d3fd165d Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa am: 8de860c56d am: 4b62c5c0b1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I2da30f91aa7d38a36f22cd3cee7ade1a48a1cfb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 04:26:07 +00:00
Treehugger Robot
8de860c56d Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I3b7ce6847678cf5103077aedd45a117106faa239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 03:03:22 +00:00
Treehugger Robot
391bc4c9aa Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I71ebe0cd1be796408c05cef88790ec9f492ce102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 02:35:06 +00:00
Mikhail Naganov
00bac4ea16 audio: Refactor transaction status checks in VTS
Introduce a GTest-like macro for validating the transaction
status. Refactor the code of VTS to use it.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I91d9ed03c7fb72f5bee55f94653499960be3e497
2022-09-15 23:58:50 +00:00
Mikhail Naganov
546ce87c95 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: I5d8df0394cc1d0865d9de533e5f37b352ff4407f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:22:28 +00:00
Mikhail Naganov
d2575f7332 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Id2ca6b2c8639291b340fd858d8751b6eb08839bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:50:05 +00:00
Mikhail Naganov
ba476fa7b3 Merge "audio: Cleanups and refactorings" am: e503e08107
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Iabe91047ba999c995c49d39129211ea19b2aa2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 18:20:12 +00:00
Mikhail Naganov
e503e08107 Merge "audio: Cleanups and refactorings" 2022-09-13 17:55:22 +00:00
Mikhail Naganov
a2c5ddf993 audio: Cleanups and refactorings
Added utility functions for operating on positional
bit flags.

Moved retrieval of offload mix ports to ModuleConfig
utility class.

Clarify the names of read/write tests.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id20881c2e62bc1b95d8fc3c268f99e36337dce7a
2022-09-12 23:00:42 +00:00
Lorena Torres-Huerta
5a6670a9c5 Merge changes from topic "media_common_types_version_bump" am: e38b08ad47
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203398

Change-Id: Iccdc82a0eedc5ad67d0a62387562ffae638893ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 23:55:29 +00:00
Lorena Torres-Huerta
72a11980f6 Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: 9ae4f224ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203397

Change-Id: I84a93a066aaeadd9f3cf3f70a92dbe20a814b6e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 23:55:22 +00:00
Lorena Torres-Huerta
4dfb4343e7 Use explicit aidl versions for audio hal and soundtrigger dependencies. am: d38e3f0d4b am: 9a0e2fe4b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19876525

Change-Id: I65889748920f07d3b55e04b96d0ec23e352eb02e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 18:38:11 +00:00
Lorena Torres-Huerta
13792816fa Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. am: dd2b7eb564 am: 22ca577fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19874524

Change-Id: I5a491aefded9c7dd4ca8f56e4b189d7b45206911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 18:38:00 +00:00
Lorena Torres-Huerta
d38e3f0d4b Use explicit aidl versions for audio hal and soundtrigger dependencies.
There are still issues with importing implicit versions. Switching to explicit versions while b/188871598 is worked out.

Bug: 242678729
Test: m; AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api && AIDL_FROZEN_REL=true m
Merged-In: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
Change-Id: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
(cherry picked from commit 8296aa824b)
2022-09-07 00:55:19 +00:00
Lorena Torres-Huerta
dd2b7eb564 Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
This requires a version bump to android.media.audio.common.types.

cc_defaults and java_defaults are used in order to avoid explicitly updating version references in several Android.bp files when we do future version bumps.

Bug: 242678729
Test: m
Merged-In: Id17820f210f625e370992db4f9f85e37887b088b
Change-Id: Id17820f210f625e370992db4f9f85e37887b088b
2022-09-06 23:14:58 +00:00
Mikhail Naganov
b5a665a326 audio: Add checks to effects feature configs retrieval am: 8e3480edfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19806116

Change-Id: Ief00037cb4237b1a7d3f66fb6287f87e2e0761ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 22:17:06 +00:00
Lorena Torres-Huerta
308e257397 Use explicit aidl versions for audio hal and soundtrigger dependencies.
There are still issues with importing implicit versions. Switching to explicit versions while b/188871598 is worked out.

Bug: 242678729
Test: m; AIDL_TRANSITIVE_FREEZE=true m aidl-freeze-api && AIDL_FROZEN_REL=true m
Merged-In: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
Change-Id: Ide6a90716bf042fbb925357e110bc84ddb9e96fb
(cherry picked from commit 8296aa824b)
2022-09-01 21:57:03 +00:00
Lorena Torres-Huerta
9ae4f224ab Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
This requires a version bump to android.media.audio.common.types.

cc_defaults and java_defaults are used in order to avoid explicitly updating version references in several Android.bp files when we do future version bumps.

Bug: 242678729
Test: m
Merged-In: Id17820f210f625e370992db4f9f85e37887b088b
Change-Id: Id17820f210f625e370992db4f9f85e37887b088b
(cherry picked from commit bf94fa32cb)
2022-09-01 21:37:43 +00:00
Shunkai Yao
19a30e0200 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb am: 4526d844d1 am: 39be76e891
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I5756aa9ff46e18899d3b29211101f48d2f1968b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:24 +00:00
Shunkai Yao
4d780e918c AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2 am: 04428686b9 am: 2970bb4f43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I9a8ac95b3cf10fbc9c52d7ceae41c6224a73e90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:22 +00:00
Shunkai Yao
0f7bf04540 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0 am: 00367c28e3 am: 6e8e2f1423
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: Ica829707ac617e85264e324c6f89369cd0c83869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:20 +00:00
Shunkai Yao
1cce4bcd4b AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f am: ef34d62d01 am: 303a01a670
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I1c39f7f52d0bb9b16c3672627bcddd01c787de2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:15 +00:00
Shunkai Yao
4526d844d1 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I9faeb1598f00db6b59311fb04a09be0be7e3c718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:19:01 +00:00
Shunkai Yao
04428686b9 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I8469fa932841cf445cab55188c1caa0a61c0ff6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:58 +00:00
Shunkai Yao
00367c28e3 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I0b9ebeb6234d007c189139f2b2e6e48a05c5763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:56 +00:00
Shunkai Yao
ef34d62d01 AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I314dcdc1ae7a2554b7c7ce2d06f76d313bbb61fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:53 +00:00
Shunkai Yao
acfc7ae9cb AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: Iabe3e5899197be286db19c8ffa9429a492764e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:33 +00:00
Shunkai Yao
e0907cf5f2 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I26428d4b3eb3e3b1caed9761799755b62ad1fdea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:32 +00:00
Shunkai Yao
082f06b5f0 AIDL effect: Minimal example implementation am: c23916b96f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I7cf14ef2cfd2a7ea88aaf0c005d903bd51c5f7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:28 +00:00
Shunkai Yao
2b69b4b29f AIDL effect: Initial IFactory interface definition am: f1d6039f96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: Iba9355ce9775d8f8bd8213d11bd31070209c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:21 +00:00
Mikhail Naganov
8e3480edfe audio: Add checks to effects feature configs retrieval
The size of the feature config needs to be limited
by the Binder transaction size. This check is enforced
before calling into legacy C API.

Also, fixed invalid calculation of buffer size
in Effect::getSupportedConfigsImpl.

Bug: 240266798
Test: atest VtsHalAudioEffectV7_0TargetTest
Change-Id: I1a1f7931a07e28642967fa68d9a358429138db29
2022-09-01 00:35:52 +00:00
Shunkai Yao
43f9a07e04 AIDL effect: Extract common parts of effect service into cc_defaults
Bug: b/238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea
Change-Id: I58d925b3f4a3d41d4014f54f78d95c26cc5520ea
(cherry picked from commit c8ed5c27a1)
2022-08-30 22:34:04 +00:00
Shunkai Yao
67b1be60ab AIDL effect: Add vts for the initial effect AIDL interface implementation
Tests basic binder calls of IFactory.

Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest
Merged-In: If5db3cae0447f41a149a60505d208070fbfedb7f
Change-Id: If5db3cae0447f41a149a60505d208070fbfedb7f
(cherry picked from commit 1f19c23ab6)
2022-08-30 22:13:17 +00:00
Shunkai Yao
c23916b96f AIDL effect: Minimal example implementation
Add effect factory placeholder implementation.
Update android.hardware.audio.service-aidl.example to include effects.

Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest

Merged-In: I88266b509a03ee336e22be460580c5b22123659e
Change-Id: I88266b509a03ee336e22be460580c5b22123659e
(cherry picked from commit 8a0ae5430f)
2022-08-30 22:11:16 +00:00
Shunkai Yao
f1d6039f96 AIDL effect: Initial IFactory interface definition
Bug: 238913361
Test: atest VtsHalAudioEffectTargetTest

Merged-In: I9f5ef1284bb5d77a9d60cb8b901742fc8e467926
Change-Id: I9f5ef1284bb5d77a9d60cb8b901742fc8e467926
(cherry picked from commit d56bc22d1e)
2022-08-30 22:09:18 +00:00
Mikhail Naganov
fda70a6411 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e am: c8df971609 am: e579d10f70 am: af8ca6aedd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: I7b3d3db9a3eea7611419a2c15c00de1c959de57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:08 +00:00
Mikhail Naganov
ee603672d8 audio: Implementation of audio I/O, part II am: 4f5d3f12f5 am: 4af7cb62b4 am: 43f77e934b am: 6726857711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199346

Change-Id: I6395641a8a121f6042b11d16765c1582f53fdd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:06 +00:00
Mikhail Naganov
c2d3baaf50 audio: Fix the lifetime of the StreamWorker's logic part am: 0b9c5feed1 am: 4b279d6a32 am: 231ca12ce8 am: 63989892e3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199345

Change-Id: I90e8237e5427fd114a4c661437971906cff0219d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:03 +00:00
Mikhail Naganov
431bb8d692 audio: Allow stopping a StreamWorker from the looping thread am: 48d3115614 am: 33b5a6d8b4 am: 8883713e20 am: 783ebc4737
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199344

Change-Id: Iab987590a96c09d98d0bffe714c6d0f8f0032b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 18:47:00 +00:00
Mikhail Naganov
e579d10f70 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e am: c8df971609
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: I0f8f5a323b45a6ae287cc702d0be418d8f882977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:18 +00:00
Mikhail Naganov
43f77e934b audio: Implementation of audio I/O, part II am: 4f5d3f12f5 am: 4af7cb62b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199346

Change-Id: Id7d990b633efff99525d04cd3581f40083025ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:16 +00:00
Mikhail Naganov
231ca12ce8 audio: Fix the lifetime of the StreamWorker's logic part am: 0b9c5feed1 am: 4b279d6a32
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199345

Change-Id: I1492567a602981f87ea703fba38ce7b1cd68a524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:14 +00:00
Mikhail Naganov
8883713e20 audio: Allow stopping a StreamWorker from the looping thread am: 48d3115614 am: 33b5a6d8b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199344

Change-Id: Ie6ccc3aa54a7614184784b3433d7e1c4044d7115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:54:12 +00:00
Mikhail Naganov
c8df971609 audio: Add StreamDescriptor.frameSizeBytes am: a2c714129e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199852

Change-Id: Ifc2501a7e00e356a83b8f1900df1c6d11ce40106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:25:07 +00:00
Mikhail Naganov
4af7cb62b4 audio: Implementation of audio I/O, part II am: 4f5d3f12f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199346

Change-Id: Ibe64114f512b5f60226a4466e7a42e0f58d20fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:25:05 +00:00
Mikhail Naganov
4b279d6a32 audio: Fix the lifetime of the StreamWorker's logic part am: 0b9c5feed1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199345

Change-Id: Idcb74d5a6cbbf3fed8d516c28280716fffffccd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:25:04 +00:00
Mikhail Naganov
33b5a6d8b4 audio: Allow stopping a StreamWorker from the looping thread am: 48d3115614
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199344

Change-Id: Ie0c5c6ee63b0e017dd909d7c894beacbddb8ce18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 17:25:02 +00:00
Mikhail Naganov
a2c714129e audio: Add StreamDescriptor.frameSizeBytes
This field indicates the frame size and is filled by
the HAL module, so that the client does not have
to calculate it.

As a side effect, in the VTS code, a StreamContext can
now be created solely from a StreamDescriptor.

Added unit tests for the functions from Utils.

Bug: 205884982
Test: atest libaudioaidlcommon_test
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Ief836b8b2d35bacb1f9778e2462d540554149d7f
Change-Id: Ief836b8b2d35bacb1f9778e2462d540554149d7f
(cherry picked from commit 5862c1e3bc)
2022-08-30 03:54:07 +00:00
Mikhail Naganov
f170914719 audio: Use 'sdk_version' instead of 'platform_apis' am: 409ce2a665 am: d124417621 am: 4b293d94a9 am: a588609b33
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199343

Change-Id: I0d4228bf3ca8b4d9d8385b8a1848d019204447dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 02:57:25 +00:00
Mikhail Naganov
4b293d94a9 audio: Use 'sdk_version' instead of 'platform_apis' am: 409ce2a665 am: d124417621
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199343

Change-Id: I51e6d831816760bd9d0c6f35633018e9a3c305c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:50:50 +00:00
Mikhail Naganov
4f5d3f12f5 audio: Implementation of audio I/O, part II
This patch implements audio I/O for the synchronous, non-MMAP
case.

Updated the StreamDescriptor structure to make it usable.
Clarified comments on the expectations for the client and
the HAL module.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I09651c6e80a397c80870622ac19234b4d4a38cbb
Change-Id: I09651c6e80a397c80870622ac19234b4d4a38cbb
(cherry picked from commit 01803d454a)
2022-08-30 01:39:24 +00:00
Mikhail Naganov
0b9c5feed1 audio: Fix the lifetime of the StreamWorker's logic part
Fix the mistake of making StreamWorker to inherit
from the part which provides actual thread logic (Impl).
The lifetime of the logic object must be longer
than the lifetime of the StreamWorker's thread.
Otherwise, the thread could still have running while
the logic has already been destroyed (consider
the order of destructors in C++ class inheritance).

With this fix, the StreamWorker class does not have
to be a template anymore, thus reorganize the code
to move big methods into a .cpp file.

Bug: 205884982
Test: atest libaudioaidlcommon_test --iterations
Merged-In: I5bc2c8fd9d78a0fbc9fddab67456cc5214584045
Change-Id: I5bc2c8fd9d78a0fbc9fddab67456cc5214584045
(cherry picked from commmit 84024eccee)

Change-Id: I70958f437657b574cda6480c3216a0b1ea252433
2022-08-30 01:36:31 +00:00
Mikhail Naganov
48d3115614 audio: Allow stopping a StreamWorker from the looping thread
Enhance the return type of the 'workerCycle' to allow it
exiting without inducing an error on the controller side.

Also, put StreamWorker into a namespace.

Bug: 205884982
Test: atest libaudioaidlcommon_test --iterations
Merged-In: I3b27028b10f80f27985040cae8f8b0e6ab63ddad
Change-Id: I3b27028b10f80f27985040cae8f8b0e6ab63ddad
(cherry picked from commit 5021df71c7)
2022-08-30 01:30:19 +00:00
Mikhail Naganov
d124417621 audio: Use 'sdk_version' instead of 'platform_apis' am: 409ce2a665
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2199343

Change-Id: Id8ce27cee0c7e61966b9a7e81d4c05db8e701ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 01:21:27 +00:00
Mikhail Naganov
409ce2a665 audio: Use 'sdk_version' instead of 'platform_apis'
Replace 'platform_apis: true' with 'sdk_version: module_current'.
The former causes compiling against SDK source code,
this is not needed for the audio HAL.

Bug: 205884982
Test: m android.hardware.audio.service-aidl.example
Change-Id: I9b9c32707ac7276f5cd077681bd1f8122bc20feb
Merged-In: I9b9c32707ac7276f5cd077681bd1f8122bc20feb
(cherry picked from commit 714e959c89)
2022-08-29 22:42:26 +00:00
Mikhail Naganov
14d6d99e31 audio: Implementation of audio I/O, part I am: 6a4872dff0 am: 1909ccc5b6 am: 9190804521 am: 54a54889c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197183

Change-Id: I81afe20792c53b1ab62360471d903ee1afbc836b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 17:16:19 +00:00
Mikhail Naganov
cb7ca0d78a audio: Implement setting name and priority in StreamWorker am: 48e2e8fe49 am: 55b6ead6df am: 07387af715 am: 782200c1fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197182

Change-Id: I3155068cba143a79f7a72f3369b2d971e2224a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 17:16:18 +00:00
Mikhail Naganov
58186fa095 audio: Prevent priority inversions in aidl StreamWorker am: 0c174e9133 am: d6070e0abe am: e1c6613fc9 am: c69c80cdae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197181

Change-Id: I95f0ac43c1bd0242c062973ce12e6c6d3fe1e02e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 17:16:16 +00:00
Mikhail Naganov
f0202e289e audio: Add StreamWorker to aidl/common am: 614e4b5f16 am: 50970c04b9 am: 10ec4cde06 am: 734842e02a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197180

Change-Id: I6be01935b23339a9fc1190d0ca863fc140c15a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 17:16:14 +00:00
Mikhail Naganov
9190804521 audio: Implementation of audio I/O, part I am: 6a4872dff0 am: 1909ccc5b6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197183

Change-Id: I66a489672d148dec0989e1b9e65239a945f2d87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:21:21 +00:00
Mikhail Naganov
07387af715 audio: Implement setting name and priority in StreamWorker am: 48e2e8fe49 am: 55b6ead6df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197182

Change-Id: I6cf408da9be48db2e16859fa03ce4de09ae5d775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:21:19 +00:00
Mikhail Naganov
e1c6613fc9 audio: Prevent priority inversions in aidl StreamWorker am: 0c174e9133 am: d6070e0abe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197181

Change-Id: Ie53e6a87c2029960979f9c58aa0f86d35e472449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:21:17 +00:00
Mikhail Naganov
10ec4cde06 audio: Add StreamWorker to aidl/common am: 614e4b5f16 am: 50970c04b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197180

Change-Id: I6c39d6983c2e6ab5004aa55f0eb75b38cdfef2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 16:21:15 +00:00
Mikhail Naganov
1909ccc5b6 audio: Implementation of audio I/O, part I am: 6a4872dff0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197183

Change-Id: I41a6efd70fe448ad6bc7e4f8f53031a59aced4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 15:52:59 +00:00
Mikhail Naganov
55b6ead6df audio: Implement setting name and priority in StreamWorker am: 48e2e8fe49
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197182

Change-Id: I9044435d1dcde9e300512eec662893cdea1bcc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 15:52:57 +00:00
Mikhail Naganov
d6070e0abe audio: Prevent priority inversions in aidl StreamWorker am: 0c174e9133
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197181

Change-Id: I3586200d330eafef788a0632bf47700f3a9d4c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 15:52:55 +00:00
Mikhail Naganov
50970c04b9 audio: Add StreamWorker to aidl/common am: 614e4b5f16
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2197180

Change-Id: If213bf5dc79622aebe32138a1dd02696bbfaec0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 15:52:54 +00:00
Mikhail Naganov
6a4872dff0 audio: Implementation of audio I/O, part I
This patch adds necessary structures and prepares for implementing
data flow for audio I/O.

Also in this patch we clarify the relationship between audio patches
and buffer size for audio I/O, and between buffer size and latency.

Bug: 205884982
Bug: 233816848
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I8522632607d4cf50a112225c19b5dd5ad8848591
Change-Id: I8522632607d4cf50a112225c19b5dd5ad8848591
(cherry picked from commit 68bee70442)
2022-08-26 02:44:15 +00:00
Mikhail Naganov
48e2e8fe49 audio: Implement setting name and priority in StreamWorker
Audio threads need to be able to set their priority.
Also, traditionally these worker threads set a custom
thread name. Implement this functionality in StreamWorker.

Since initialization steps can fail, implement simple
error reporting via a string field `mError`. The state
of the string field replaces the dedicated `ERROR` worker
state.

Bug: 205884982
Test: atest libaudioaidlcommon_test --iterations
Merged-In: Ie9ab94922d47f277a4993a90b478a2fa76657923
Change-Id: Ie9ab94922d47f277a4993a90b478a2fa76657923
(cherry picked from commit e9e0f7c0f5)
2022-08-26 02:43:37 +00:00
Mikhail Naganov
0c174e9133 audio: Prevent priority inversions in aidl StreamWorker
Avoid taking a lock in high priority worker threads
without a real need.

Bug: 205884982
Test: atest libaudioaidlcommon_test --iterations
Merged-In: I8cc0f5cb58752b7b7d413a9f4e46093c39445892
Change-Id: I8cc0f5cb58752b7b7d413a9f4e46093c39445892
(cherry picked from commit d989a4b669)
2022-08-26 02:42:46 +00:00
Mikhail Naganov
614e4b5f16 audio: Add StreamWorker to aidl/common
This utility class has been copied from HIDL VTS.
It will be used both for the default implementation
and AIDL VTS, and might need modifications.

Bug: 205884982
Test: atest libaudioaidlcommon_test
Merged-In: I43b35b0c23ae45305dca66e15b60820cad19635e
Change-Id: I43b35b0c23ae45305dca66e15b60820cad19635e
(cherry picked from commit c17f0484bc)
2022-08-26 02:41:58 +00:00
Treehugger Robot
856fced74a Merge "audio: Update README.md to add info about the AIDL version" 2022-08-25 17:59:25 +00:00
Mikhail Naganov
5aca7616f7 audio: Update README.md to add info about the AIDL version
This complements CL https://r.android.com/2169871.

Bug: 205884982
Test: N/A
Merged-In: Ia627e3845a078e6a4c545b13a723a6c5a038c53b
(cherry picked from commit bbf297804e)
Change-Id: I78696647e64ae1a5f216c3ab4f4a7194a5145072
2022-08-25 16:34:25 +00:00
Treehugger Robot
3c73017a68 Merge changes I118b2c04,I111b72aa,Ia5d29126 am: 660e9a4c48 am: 0a8a2b9d33 am: c9b4e030ad am: c8f5cd1d5b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194572

Change-Id: I2570ab9dfae672c53c3ef1a7c4454524b27d9f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:15:27 +00:00
Mikhail Naganov
ba423ed638 audio: Improve debug logging in the AIDL version, fix bugs am: 16db9b7c97 am: 823d50db23 am: 702719bd74 am: eed7f5baf8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194571

Change-Id: Ic5cfdc2444ae955d5183396d1ee7a8f284f640d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:15:26 +00:00
Mikhail Naganov
9add9e336e audio: Disable the C++ backend for android.hardware.audio.core am: f84d640186 am: 0dee516d06 am: e4b61098a8 am: 23934214dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194570

Change-Id: I8b84f43e558ca7c4581689450b2221c8c41f8c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:15:24 +00:00
Treehugger Robot
24465662af Merge "[Bluetooth apex] Use new apex name" am: 2412da0826 am: a326b313f7 am: 67d8a557e8 am: 606f24d35a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2192236

Change-Id: I3b03eaefa8f28eec4b906dd21fda17a51aa004ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 05:14:42 +00:00
Treehugger Robot
c9b4e030ad Merge changes I118b2c04,I111b72aa,Ia5d29126 am: 660e9a4c48 am: 0a8a2b9d33
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194572

Change-Id: I9e553f4bb682e1c9e446ffc554021affe70e36a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:50:13 +00:00
Mikhail Naganov
702719bd74 audio: Improve debug logging in the AIDL version, fix bugs am: 16db9b7c97 am: 823d50db23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194571

Change-Id: I0e7a948838271633fcd108e895da34b9697d2ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:50:11 +00:00
Mikhail Naganov
e4b61098a8 audio: Disable the C++ backend for android.hardware.audio.core am: f84d640186 am: 0dee516d06
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194570

Change-Id: Ib5b37ba19757ff33d13ba4bcf339d50c0a7b1e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:50:10 +00:00
Treehugger Robot
67d8a557e8 Merge "[Bluetooth apex] Use new apex name" am: 2412da0826 am: a326b313f7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2192236

Change-Id: I892c3da23abe265c7ccaf414439ab48ed548a4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:49:17 +00:00
Mikhail Naganov
823d50db23 audio: Improve debug logging in the AIDL version, fix bugs am: 16db9b7c97
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194571

Change-Id: I3cb11ebd93fcfcb172630fb9dfb539b8539d1a0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:22:17 +00:00
Mikhail Naganov
0dee516d06 audio: Disable the C++ backend for android.hardware.audio.core am: f84d640186
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194570

Change-Id: I78415af773a0580e570e13456617f85666d75595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:22:16 +00:00
Treehugger Robot
660e9a4c48 Merge changes I118b2c04,I111b72aa,Ia5d29126
* changes:
  audio: Add support for compressed offload
  audio: Improve debug logging in the AIDL version, fix bugs
  audio: Disable the C++ backend for android.hardware.audio.core
2022-08-25 02:24:01 +00:00
Treehugger Robot
2412da0826 Merge "[Bluetooth apex] Use new apex name" 2022-08-25 02:16:03 +00:00
Mikhail Naganov
111e0ceab5 audio: Add support for compressed offload
- Add compressed offload mix port into default implementation.
- Require AudioOffloadInfo to be passed to IModule.openOutputStream
  for compressed offload port configs.
- Update VTS to handle compressed offload.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I118b2c04bff12b64a7cac4dc2c88217a6a270046
Change-Id: I118b2c04bff12b64a7cac4dc2c88217a6a270046
(cherry picked from commit 975ea3ae89)
2022-08-25 00:25:55 +00:00
Mikhail Naganov
16db9b7c97 audio: Improve debug logging in the AIDL version, fix bugs
- Make sure the AIDL default implementation has debug output enabled.
- Log additional info in the AIDL VTS to facilitate debugging.
- Make resource handler classes move-only types.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I111b72aaf12962f00b4d31b8ac87186bca5eb853
Change-Id: I111b72aaf12962f00b4d31b8ac87186bca5eb853
(cherry picked from commit f82fc6476d)
2022-08-25 00:25:25 +00:00
Mikhail Naganov
f84d640186 audio: Disable the C++ backend for android.hardware.audio.core
android.hardware.audio.core will need to use FMQ,
which does not support the C++ backend in the AIDL version.

Migrate VTS tests from the C++ backend to the NDK backend.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Ia5d29126afdb4bb97dd063a032b96ab83b9ce36e
Change-Id: Ia5d29126afdb4bb97dd063a032b96ab83b9ce36e
(cherry picked from commit 8fcc442416)
2022-08-25 00:24:53 +00:00
Treehugger Robot
1709c0e72a Merge "audio HAL: Support for external device connections" am: eefac18b26 am: 62be00231e am: ea913efbd4 am: dac39d4c69
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194135

Change-Id: Ib6f976417044ae41b56a90f4f8ce2696e6507a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 18:14:53 +00:00
Treehugger Robot
ea913efbd4 Merge "audio HAL: Support for external device connections" am: eefac18b26 am: 62be00231e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2194135

Change-Id: I9b72f28864edf14ec63bd80c1917d23a25580387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:34:15 +00:00
Treehugger Robot
eefac18b26 Merge "audio HAL: Support for external device connections" 2022-08-24 15:01:49 +00:00
Xin Li
056da74605 Merge "Merge android13-tests-dev" 2022-08-23 23:07:05 +00:00
Mikhail Naganov
00603d14b3 audio HAL: Support for external device connections
Add methods 'IModule.connect/disconnectExternalDevice' which inform
audio HAL about connection / disconnection of an external
non-attached device. Add method 'getAudioRoutesForPort' to
retrieve only routes that include the specified port.

Update the behavior of 'getAudioPorts' and 'getAudioRoutes'
indicating that the result may change due to instantiation
of new device ports for connected external devices.

Clarify behavior of 'IModule.setAudioPortConfig' that it can not
work with device ports with no profiles.

Add debug flags structure 'ModuleDebug' and method
'IModule.setModuleDebug' to control the debugging aspects. VTS
tests use these flags to test HAL behavior which would otherwise
require human intervention.

Update the default implementation and VTS for the AIDL changes.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Iad5f7009e283729206f88b6278c8992f7f8a92a2
Change-Id: Iad5f7009e283729206f88b6278c8992f7f8a92a2
2022-08-23 22:40:20 +00:00
Treehugger Robot
eb46983781 Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff5608 am: 933e626ce7 am: 06bd2b0cff am: 6881a2e9ce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190590

Change-Id: I6fc34190ae71e19c6b56956f1ba9c1c10e6c81f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 22:01:02 +00:00
Jiyong Park
cf55b93e75 Explicitly depend on audio.common-V1 am: d25eddfd7d am: a20627a17e am: 13f2863da7 am: e2dba4d599
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190589

Change-Id: I87d18f2611e9aabd43219b70ec0d198d5d7e3ba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 22:01:01 +00:00
Mikhail Naganov
9b139c6fef audio HAL: initial VTS tests am: e5d747e908 am: 4c6e690f4f am: 29326f2ca5 am: c7fe9f1fde
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190588

Change-Id: I6ca23851fe4e92d2c870adde05ce17c10b400a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 22:00:59 +00:00
Mikhail Naganov
fd1c54dcb6 audio HAL: Minimal example implementation am: df5adfde15 am: 88a81f47c6 am: 09c9ec4195 am: 4d9b179925
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190587

Change-Id: I3b9a0209d69f9520067ea1863f62c412c670b758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 22:00:57 +00:00
Mikhail Naganov
0ce63f6d67 audio HAL: Initial AIDL interfaces am: bd4013f179 am: cf54f19db5 am: e2ec1b9f0d am: 23890bc388
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190586

Change-Id: Id648458d9109f3bc0a270129cfe381f385667571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 22:00:53 +00:00
Treehugger Robot
06bd2b0cff Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff5608 am: 933e626ce7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190590

Change-Id: I3300e891699abe434200fc0ef488565ff76476fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 21:09:27 +00:00
Jiyong Park
13f2863da7 Explicitly depend on audio.common-V1 am: d25eddfd7d am: a20627a17e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190589

Change-Id: I095e853974ec9e8a55b3ad2c9e8ed9ee4f330446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 21:09:25 +00:00
Mikhail Naganov
29326f2ca5 audio HAL: initial VTS tests am: e5d747e908 am: 4c6e690f4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190588

Change-Id: I240c77c3bbdfc8828084bef12a38301f3ed7d4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 21:09:23 +00:00
Mikhail Naganov
09c9ec4195 audio HAL: Minimal example implementation am: df5adfde15 am: 88a81f47c6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190587

Change-Id: Icc0f640c601b84f5d5d393d865e4443a137cf355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 21:09:20 +00:00
Mikhail Naganov
e2ec1b9f0d audio HAL: Initial AIDL interfaces am: bd4013f179 am: cf54f19db5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190586

Change-Id: Ia797c226ea5b59222d97fde71ef7fe6a29ae3b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 21:08:49 +00:00
William Escande
2591c3d0cf [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: Ib63646722cbef948b5198fc5f2a9b5ac2ca52ae3
2022-08-22 11:27:58 -07:00
Jiyong Park
d25eddfd7d Explicitly depend on audio.common-V1
Background:

android.hardware.audio.common was frozen in the upstream tm-dev.
Previously, the interface had only V1 (as the in-development version)
and it was in the VNDK. However, after the freeze, it will have V1 and
V2, and only V1 will remain in the VNDK, because we can't have multiple
versions of the same AIDL interface in VNDK (it's just waste of memory).

android.hardware.audio.core is a new AIDL interface that doesn't exist
in TM. It is also a member of VNDK and imports the audio.common
interface. So far, the import has been done without an explicit version
number (i.e. `imports: ["android.hardware.audio.common"]`). As a result,
V1 was imported before the freeze, and V2 (the latest) will be imported
after the freeze.

Problem:

audio.core depending on audio.common-V2 is NOT allowed since the former
is a member of VNDK, but the latter isn't. VNDK should form a closure.
We are actually hitting this:

```
> error: hardware/interfaces/audio/aidl/Android.bp:71:1: module
"android.hardware.audio.core-V1-ndk" variant
"android_vendor.Tiramisu_arm64_armv8-a_static" (created by module
"android.hardware.audio.core-V1-ndk-generator" (created by module
"android.hardware.audio.core_interface")): (native:vendor:vndk) should
not link to "android.hardware.audio.common-V2-ndk" (native:vendor):
VNDK-core must only depend on VNDK-core or VNDK-SP
```

To fix this, make the dependency to audio.common to be explicit about
the version. This change can't be uploaded to tm-dev as audio.core
doesn't exist there, and must be submitted before the AIDL APIs are
frozen there.

Bug: 225941299
Test: m

Merged-In: Iadc96d558d5c7431b0a2b0cbd28b99319a24ee44
Change-Id: Iadc96d558d5c7431b0a2b0cbd28b99319a24ee44
(cherry picked from commit cc489264af)
2022-08-20 00:14:53 +00:00
Mikhail Naganov
e5d747e908 audio HAL: initial VTS tests
Tests basic functionality for enumerating
capabilities of an audio module, audio patches
creation, and opening of I/O streams.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I7c7c3c7008f2fc43db1542455c74444a08e55534
Change-Id: I7c7c3c7008f2fc43db1542455c74444a08e55534
(cherry picked from commit 7abc70f908)
2022-08-20 00:14:53 +00:00
Mikhail Naganov
df5adfde15 audio HAL: Minimal example implementation
Implements basic functionality for enumerating
capabilities of an audio module, audio patches
creation, and opening of I/O streams.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Ie5d67e9192a598260e762ae9368f99592c8ad97e
Change-Id: Ie5d67e9192a598260e762ae9368f99592c8ad97e
(cherry picked from commit ecdc6ca8e8)
2022-08-20 00:14:53 +00:00
Mikhail Naganov
bd4013f179 audio HAL: Initial AIDL interfaces
This adds basic support for enumerating capabilities
of an audio module, creation of patches, and opening of
I/O streams.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Ib1ef13c95d338b6ef1bde7d87dcd675fc1d35e85
Change-Id: Ib1ef13c95d338b6ef1bde7d87dcd675fc1d35e85
(cherry picked from commit ee27478264)
2022-08-20 00:14:53 +00:00
Jiyong Park
f4b5e7b993 Explicitly depend on V1 of android.media.audio.common.types
... for the same reason as cc489264af

Bug: 225941299
Test: m
Merged-In: I269d61c8c441b3db0832f5450f5e5a84a5989a99
Change-Id: I269d61c8c441b3db0832f5450f5e5a84a5989a99
(cherry picked from commit 446519a370)
2022-08-20 00:14:53 +00:00
jiabin
bbf8f4e998 Fix array out of bound in audioTransportToHal.
The number of audio profile and extra audio descriptor must not be
greater than the maximum value.

Bug: 237288416
Bug: 237717857
Test: repo step in bug
Test: atest android.hardware.audio.common@7.0-util_tests
Change-Id: I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9
Merged-In: I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9
(cherry picked from commit 0ee75ca925)
(cherry picked from commit f16c6d3a57)
Merged-In: I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9
2022-08-19 18:43:50 +00:00
Xin Li
7406132b49 Merge android13-tests-dev
Merged-In: Ie372f74f3a52decce592181c7d65624f8ec03ed1
Change-Id: Ia81e24391de0d26737a5d65fbc5c8bb86bf03d5b
2022-08-17 16:37:46 -07:00
Mikhail Naganov
1ac4ee14fa audio: Restrict the new VTS test for effects to T+ am: 978a0f9ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19531023

Change-Id: I39798c9c133a9cbf8e36d085b40bc2ab9203e29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 20:07:20 +00:00
Mikhail Naganov
978a0f9ea0 audio: Restrict the new VTS test for effects to T+
The VTS test AudioEffectHidlTest#GetParameterInvalidMaxReplySize
should only run for new devices launching on T+ because
older vendor images do not have updated HAL default wrapper
code and thus will fail.

Bug: 237291425
Bug: 240932876
Test: atest VtsHalAudioEffectV7_0TargetTest:Equalizer_IEffect/AudioEffectHidlTest#GetParameterInvalidMaxReplySize/0_default
Change-Id: I1697155fe7781cbc96c1913e674699e299aa26b3
2022-08-05 00:30:59 +00:00
TreeHugger Robot
3e7b3fe78c Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51 am: 6188e3b113 am: 808ba0f8a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935

Change-Id: I09b15647260de9800faa79960de305c30fedbe02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:08:47 +00:00
Mikhail Naganov
c956ec5df8 audio VTS: CompressedOffloadOutputStream to check the vendor API level am: 3f2e330990 am: b9b5652fcc am: ebb6782251 am: ab516998f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340462

Change-Id: I21a8f50bc3badb68ce23ef3587c1cfc9cc1aaa31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:08:45 +00:00
Mikhail Naganov
6730af3154 audio VTS: add CompressedOffloadOutputStream test am: 56f1666feb am: 96ddc8f20f am: 9d171af82d am: e493259938
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345352

Change-Id: I0f30a0cd3e2a7292cc50199ce9e4990fead4f6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:08:43 +00:00
Mikhail Naganov
4461adf9ef audio VTS: Refactor test parameter generation for I/O streams am: 1e703f182e am: a4c937fe91 am: 1d8b62bf92 am: 2d86511613
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340459

Change-Id: Iaa658e82356acbd72956c1f5c0b00c5a29bde97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 01:08:41 +00:00
TreeHugger Robot
808ba0f8a9 Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51 am: 6188e3b113
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935

Change-Id: I7e03e1aebc8d994f34d7228c778cfad40feee71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 00:19:14 +00:00
Mikhail Naganov
ab516998f5 audio VTS: CompressedOffloadOutputStream to check the vendor API level am: 3f2e330990 am: b9b5652fcc am: ebb6782251
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340462

Change-Id: I0e751fdd984eb60a6c32a6d837fcf7ec93cd64fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 00:19:13 +00:00
Mikhail Naganov
e493259938 audio VTS: add CompressedOffloadOutputStream test am: 56f1666feb am: 96ddc8f20f am: 9d171af82d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345352

Change-Id: I3ed7195ebfdafe747ad238fdfcacc66ee3b21e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 00:19:11 +00:00
Mikhail Naganov
2d86511613 audio VTS: Refactor test parameter generation for I/O streams am: 1e703f182e am: a4c937fe91 am: 1d8b62bf92
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340459

Change-Id: I7f0253cab91f1d8166fa42e9b9086c19621a846e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 00:19:09 +00:00
TreeHugger Robot
b4027e5f42 Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935

Change-Id: I198bf32ab2a4f5879b8a40653354eeea6a9ac84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:53:26 +00:00
Mikhail Naganov
56c53559a8 audio VTS: CompressedOffloadOutputStream to check the vendor API level am: 3f2e330990 am: b9b5652fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340462

Change-Id: Ie67480451fd3216627d17b68cae6e2e6764bc576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:53:23 +00:00
Mikhail Naganov
1808705ea7 audio VTS: add CompressedOffloadOutputStream test am: 56f1666feb am: 96ddc8f20f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345352

Change-Id: I245c82c92b0f1a0f6275d3b81c3679e77701856b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:53:19 +00:00
Mikhail Naganov
9b052883b6 audio VTS: Refactor test parameter generation for I/O streams am: 1e703f182e am: a4c937fe91
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19340459

Change-Id: Ie639a0ad4ea179ecd3ccec2ebe74b071dd61e3f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:53:15 +00:00
TreeHugger Robot
5c5c78aa51 Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935

Change-Id: I2b54fab89ae38c8060fbec12c080304830a467fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:21:35 +00:00