Commit Graph

1537 Commits

Author SHA1 Message Date
Lorena Torres-Huerta
0aba0e9de1 Merge "Add surround sound configuration to the AIDL Audio HAL interface." am: 9b7a21dc95 am: 7dd1177c21 am: 3fd168883c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242833

Change-Id: I07b06da5bd8991be3bd4134a9480a216c2015afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 21:08:44 +00:00
Lorena Torres-Huerta
3fd168883c Merge "Add surround sound configuration to the AIDL Audio HAL interface." am: 9b7a21dc95 am: 7dd1177c21
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242833

Change-Id: Ibdfe8e315cf995945e5bfe33c792072bf915fb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 20:35:42 +00:00
Lorena Torres-Huerta
7dd1177c21 Merge "Add surround sound configuration to the AIDL Audio HAL interface." am: 9b7a21dc95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2242833

Change-Id: I3272c432d23d7bfbbd3ba784d27562cc5fe18b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 20:06:59 +00:00
Lorena Torres-Huerta
0ba91e5759 Add surround sound configuration to the AIDL Audio HAL interface.
Bug: 205884982
Test: m android.hardware.audio.service-aidl.example
Change-Id: Ie8c69c6f0437ba6527c28f525eb06d1e338e3abc
2022-10-06 05:48:22 +00:00
Xin Li
dd05140cda Merge "Merge TP1A.221005.003" am: cf2da65bc8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2240803

Change-Id: I7bdf52783bf67a74294fb2d60335ab1ececd4946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 22:39:27 +00:00
Xin Li
c208de1713 Merge TP1A.221005.003
Merged-In: I1fcfa29d7841a1cb73bafb1ea92f3b1630992ae9
Change-Id: I56a99c984732258849fc58052c65371d5c31e6fc
2022-10-03 13:17:46 -07:00
Florian Mayer
0f1032f14e Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2 am: b07d73591f am: b47346c0e6 am: 1b1b231642 am: 28167c07cc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ibb467925b476f8bd48a5f60203fb634d8ac09a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 23:13:49 +00:00
Florian Mayer
28167c07cc Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2 am: b07d73591f am: b47346c0e6 am: 1b1b231642
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ic9056ed6c9ae107b43834dc99064b918420cc3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 23:13:13 +00:00
Florian Mayer
b47346c0e6 Merge "Revert "Disable FilterTest/1#FilterOutNonVendorTags on HWASan."" am: 4eeda58ce2 am: b07d73591f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2234750

Change-Id: Ieaf3dc9e63114d798875a5fb08de291265aee93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 22:01:41 +00:00
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
886c967b2a Merge "Fix out-of-memory error." am: f4a9ee68a3 am: 3086bb11c9 am: fa6d674608 am: 5872d55a9f am: c5bc4643c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2231087

Change-Id: I8ffbe5bb807a8512c5c16263b9040d45ba4c0e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 09:42:25 +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
36044577f0 Merge changes from topic "aidl_audio_effect_2" am: 89d993d3d8 am: 2ad819f77e am: 57d87401e3 am: 1a4b5143a4 am: 6fc21d49bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2225480

Change-Id: If9c8531596f0c95a6706f5313e9f4ec8cf3aba9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 21:49:51 +00: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
9c0e13bf00 Merge "Sync audio_policy_engine_configuration.xsd with the SDK" am: e8c9684d68 am: cdc677afa4 am: 74693ba072 am: 5c057f6c60 am: 955e3896e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2221636

Change-Id: Ia4e905d588b150f672dc443ddeb423d67090ab1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 03:14:15 +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
7382601be8 Merge changes from topic "aidl_audio_effect_2"
* changes:
  AIDL effect: Initial IEffect interface implementationi and vts test
  AIDL effect: Initial IEffect interface definition
2022-09-19 21:07:15 +00:00
Treehugger Robot
f516daae75 Merge "audio: Refactor transaction status checks in VTS" am: 857e3d98d8 am: 391bc4c9aa am: 8de860c56d am: 4b62c5c0b1 am: 17d3fd165d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2215767

Change-Id: I34aba4fe1e7eff5b123f1285f61e1bd66ffd5ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 04:54:48 +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
36117a1587 Merge "audio: Cleanups and refactorings" am: e503e08107 am: ba476fa7b3 am: d2575f7332 am: 89dce2f2ea am: 546ce87c95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2216142

Change-Id: Icc2ae59a621dcda64d2159ba945cee20a08e5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 20:45:32 +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