Commit graph

203 commits

Author SHA1 Message Date
Xin Li
64e598ce2b Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I53a278f1317f5307441103dc42dc5be6f20d7075
Change-Id: I3a53ebf7339cdb886d3c1b733b8eee1847f8832a
2024-05-24 08:28:04 -07:00
Kiyoung Kim
9e9d41d162 Remove VNDK definition(s)
As of VNDK deprecation, any libraries that defines vndk is no longer
valid anymore. This change removes all VNDK definition(s) from modules
which was VNDK.

Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: Ifdade9c052db29c989ce7d804ba725361c4c0f8e
Merged-In: Ic4f19113c1a25dc1fb60cdfbf9c0f2d8d7d09726
2024-04-05 02:29:07 +00:00
Devin Moore
a8efdb127e Vendor API level 202404 is now frozen
Ignore-AOSP-First: VINTF 202404 Finalization
Bug: 279809333
Test: build
Change-Id: Ie6d38d27a287e258c30516e0030ad8c931d06432
2024-02-20 21:05:23 +00:00
Treehugger Robot
74dc4cc5d7 Merge "[DON'T BLOCK] Test ownership migration rules" into main am: 27e97308c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2950589

Change-Id: Ie4f36b193820490e606e7f5100ca29200f832fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 01:45:21 +00:00
Aditya Choudhary
ad2ba1b851 [DON'T BLOCK] Test ownership migration rules
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.

For more details please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: Ic8c4bd6ac246e7efa98bbdaf822d12ae8e1230a5
2024-02-05 15:45:22 +00:00
Shunkai Yao
195d3d6915 Add defaults for audio AIDL interfaces
- with defaults user don't have to change their Android.bp when there is
  a update
- update AIDL audio interfaces with android.media.audio.common.types
- update Spatialization and HeadTracking AIDL usage

Bug: 273373363
Bug: 293370815
Test: m
Test: lunch panther-trunk_staging-userdebug; m; test Bluetooth Audio
Change-Id: Ic9d8afc1d4e19e4243c66065b0a5d29156632851
Merged-In: Ic9d8afc1d4e19e4243c66065b0a5d29156632851
2023-11-06 19:14:32 +00:00
Shunkai Yao
0d523099ac Add defaults for audio AIDL interfaces
- with defaults user don't have to change their Android.bp when there is
  a update
- update AIDL audio interfaces with android.media.audio.common.types
- update Spatialization and HeadTracking AIDL usage

Bug: 273373363
Bug: 293370815
Test: m
Change-Id: Ic9d8afc1d4e19e4243c66065b0a5d29156632851
2023-10-18 19:29:12 +00:00
Tom Bergan
8db0bc0131 Fix crash in SthalCli
SthalCli does not set all String fields of Properties, which results in
some fields being null, which causes a NullPointerExecption when the
Properties is converted to a SoundTrigger.ModuleProperties:
https://cs.android.com/android/platform/superproject/+/main:frameworks/base/core/java/android/hardware/soundtrigger/SoundTrigger.java;drc=e6ac0c57d7261d83870571c7198518998e0f1732;l=164

This CL fixes that problem by setting the uuid and model arch fields.
The uuid is set to a static randomly-generated UUID, instead of a
dynamic randomly-generated UUID, so the UUID is more easily grep-able.

Fixes: 300518031
Test: manually
Change-Id: I3746470551aed1e0e5a806195c124a70037f1baf
2023-09-14 21:55:14 +00:00
Devin Moore
3b6eaf883d Merge OWNERS files for soundtrigger
Test: none
Bug: 296950573
Change-Id: Iff3909e3457da21840d4351e7ab666eb61ac523a
2023-09-08 21:20:53 +00:00
Lorena Torres-Huerta
e38b08ad47 Merge changes from topic "media_common_types_version_bump"
* changes:
  Use explicit aidl versions for audio hal and soundtrigger dependencies.
  Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
2022-09-07 23:30:55 +00:00
Cole Faust
7b6acb3f2d Fix module-file name collisions
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I828de4265a247c93e778764d0ece54d4d1760daa
2022-09-05 17:56:28 -07: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
Jooyung Han
c0b24f4f13 Remove AIDL-libs from VNDK
Some are still in VNDK because they are used in other VNDK libs.

Ignore-AOSP-First: some libs are still in internal master only.

Bug: 234181591
Test: m
Merged-In: If999df9c78a20df931177da11742b1c5de19bc08
Change-Id: If999df9c78a20df931177da11742b1c5de19bc08
(cherry picked from commit 5527adfd7f)
2022-06-14 14:08:59 +09:00
Jiyong Park
46c1214761 Implement getInterfaceHash/Version for SoundTrigger
As the soundtrigger AIDL interface gets frozen for TM, java services
implementing the interface are required to implement getInterfaceHash
and getInterfaceVersion [1].

[1]
https://source.android.com/devices/architecture/aidl/stable-aidl#new-meta-interface-methods

Bug: 225941299
Test: m
Change-Id: I71f27131d2619cea2ae10a53c01ca883a459d159
2022-03-31 12:01:44 +09:00
Jiyong Park
bb73ba4e68 Add -Wno-missing-permission-annotation for soundtrigger3
Soundtrigger3 has been built with "-Werror -Weverything" (from
Android.bp) and "-Weverything -Wno-missing-permission-annotation" (from
the AIDL build system). The former is added only for the ToT version of
an AIDL interface.

So far, soundtrigger3 wasn't frozen and therefore the implicit version 1
was the ToT version. As a result, absence of @RequiresPermission in its
interface didn't break the build due to the automatically added
"-Wno-missing-permission-annotation" despite that it had "-Werror".

However, this is causing build breakage as soundtrigger3 now has version
1 and 2 (ToT) and the version 1 is built *without*
  "-Wno-missing-permission-annotation".

Fixing this by manually adding the diag flag so that it's applied to all
versions.

Bug: 225941299
Test: m
Change-Id: I3a43fc77997ef900b0f173c88530f570e436bc77
2022-03-31 12:01:43 +09:00
Jiyong Park
703e97920e Freeze AIDL APIs for TM
Bug: 225941299
Test: m
Change-Id: Ie41cc0797710f813f92c65c387f247c7806d8394
2022-03-31 12:01:39 +09:00
Rios Kao
acd3c8d964 Merge "soundtrigger: add host_supported" 2022-01-25 04:27:47 +00:00
Rios Kao
f68d9c42b8 soundtrigger: add host_supported
support host build for development.

Test: build pass
Bug: 206738138
Change-Id: I55d1b2bcdbf234efc9ca98aca00b9777327fe16c
2022-01-21 07:40:23 +00:00
Ytai Ben-Tsvi
0996ac8a44 Organize imports and fix formatting
Test: m
Fixes: 215567445
Change-Id: I1077b3fb609acde6d6dbda92139f52ad8fed7784
2022-01-20 13:48:03 -08:00
Yiming Pan
f5bb98e5b7 Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_3TargetTest." am: 6a582708ff am: a93698ce37 am: 192ccebc83 am: aaa2be452d am: 62ca95bd70
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1814067

Change-Id: I4468008d7d32e9068c341a0f28ef9de4d7c3b8c4
2021-09-30 01:26:49 +00:00
Yiming Pan
a93698ce37 Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_3TargetTest." am: 6a582708ff
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1814067

Change-Id: Ic23ed9cb701205405ca7a01c7ba2e74ddc1697b8
2021-09-30 00:36:53 +00:00
Yiming Pan
6a582708ff Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_3TargetTest." 2021-09-30 00:21:40 +00:00
Treehugger Robot
9e23602a2a Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_1TargetTest." am: 50363c763b am: 684aa290fd am: 53cb3a0502 am: 9631d8280d am: 9eef381156
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813775

Change-Id: If3b31c039c9796dddf222d74f6dfd3d75381e596
2021-09-29 22:08:36 +00:00
Treehugger Robot
f43a87c9f4 Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_0TargetTest." am: 0f312cff5c am: 4293eb7110 am: 193c2ed09f am: aca9960e0c am: 5ceb472383
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813774

Change-Id: I5142c4fa40dd3b8789546135cc5a281a4066dd7f
2021-09-29 22:08:19 +00:00
Treehugger Robot
684aa290fd Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_1TargetTest." am: 50363c763b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813775

Change-Id: I78a5e54ab28f51da8796f64de5f7056b0aaa32f2
2021-09-29 21:25:09 +00:00
Treehugger Robot
4293eb7110 Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_0TargetTest." am: 0f312cff5c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1813774

Change-Id: Ie79cc801bc8270e0759ef20f52d6a6f6c86d2a1f
2021-09-29 21:25:03 +00:00
Treehugger Robot
50363c763b Merge "Backfill owner information for VTS module VtsHalSoundtriggerV2_1TargetTest." 2021-09-29 21:10:05 +00:00
Yiming Pan
f841db160c Backfill owner information for VTS module VtsHalSoundtriggerV2_3TargetTest.
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I3cefca5ede8f0ec500155dbf15ef91ea71812824
2021-09-24 11:23:56 -07:00
Yiming Pan
6a283a309b Backfill owner information for VTS module VtsHalSoundtriggerV2_1TargetTest.
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I639a069f2701aefe885fb6924761189b402e5921
2021-09-24 11:22:37 -07:00
Yiming Pan
aefe44eae1 Backfill owner information for VTS module VtsHalSoundtriggerV2_0TargetTest.
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I428833fe6586654a0108ac402dcbeaff80080c5c
2021-09-24 11:16:25 -07:00
Mikhail Naganov
6dcf4f5c53 Update use of a.m.a.c.AudioConfig in sthal_cli_3
Bug: 188932434
Test: m sthal_cli_3
Change-Id: Ifcc94ecfa7aa9d9a5292f45a35083c4681223529
2021-08-31 18:13:20 -07:00
Ytai Ben-tsvi
c55b9be4b9 Merge changes from topic "deprecate-sthal-2.4"
* changes:
  Remove STHAL 2.4
  Create a soundtrigger v2.3 CLI mock
2021-08-26 17:36:26 +00:00
Mikhail Naganov
43a6ce023f Follow-up after ag/15645323
Make 'createConfig' a static function.

Fix OWNERS file to point to the correct location.

Bug: 188932434
Test: m sthal_cli_3
Change-Id: I7a35096acb71a246691f9bb9ddf41660f3e7cf8f
2021-08-25 21:26:15 +00:00
Ytai Ben-Tsvi
3f1c392d7e Remove STHAL 2.4
This version was only created as an intermediate version for
development and was never intended for release. STHAL 3 (AIDL) has
feature-parity with this one and is intended for release.

Bug: 181996624
Test: Manual verification of soundtrigger use-cases.
Change-Id: Ic490bbd0501ec593d741cf612f8fd995b7bb9c4e
2021-08-25 13:59:20 -07:00
Ytai Ben-Tsvi
b5db1dd146 Create a soundtrigger v2.3 CLI mock
This is ported from the v2.4 CLI in preparation for v2.4's
deprecation.

Bug: 181996624
Test: Manual invocation and verification.
Change-Id: I77c6a12b77b11d74359bcc0792a5a4c70032c7ce
2021-08-25 13:59:19 -07:00
Mikhail Naganov
e9f41f1fff Move common audio AIDL types to audio.media.audio.common
Since tests depend statically on libaudiofoundation,
they also need to depend on the generated interfaces code,
which contains vtables for interface classes.

Update 'sthal_cli_3' test app.

Bug: 188932434
Test: m HalAudioV6_0GeneratorTest
Test: m sthal_cli_3
Change-Id: Ifb8f81d02764f7710ce207603aa6fe2d20123e89
2021-08-23 17:43:20 -07:00
Treehugger Robot
8cccec2528 Merge "Add OWNERS for VTS module VtsHalSoundtriggerV2_2TargetTest" am: 45cd802948 am: 879a9323f3 am: 6c888419d5 am: adc3df5eb4 am: 39a4c7b4ae
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793001

Change-Id: I2cc6d3a13482e0ce8464e20132fa7b166fda674b
2021-08-19 21:10:56 +00:00
Treehugger Robot
879a9323f3 Merge "Add OWNERS for VTS module VtsHalSoundtriggerV2_2TargetTest" am: 45cd802948
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793001

Change-Id: I54e02338cf64ed820c7accbd70d17402d3d5a760
2021-08-19 20:00:54 +00:00
Yiming Pan
6bbff1e16e Add OWNERS for VTS module VtsHalSoundtriggerV2_2TargetTest
Each VTS module is required to have OWNERS file. The ownership is based on
go/vts-owners. For more information about ownership policy, please visit
go/xts-owners-policy.

Test: Tree Hugger
Bug: 143903671
Change-Id: I33aa46004d90aecda44d5c09809eabde0455a185
2021-08-11 16:34:56 -07:00
Bob Badour
d99d544f08 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  soundtrigger/aidl/Android.bp
  soundtrigger/aidl/cli/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I5bb1bf59e40996301a0b002211669de320d3cfb3
2021-04-07 14:12:12 -07:00
Ytai Ben-Tsvi
316f2fa1a3 Rearrange soundtrigger3 directory structure
Test: m
Change-Id: I35f041769c3835fa6d63bcb0d4bffac3c8a1aa46
2021-03-30 12:37:29 -07:00
Ytai Ben-Tsvi
9227f18137 Update STHAL mock sysprop to integer
Change-Id: I995dafdd6426bff2983ded589fb8c892068639ff
2021-03-30 12:37:29 -07:00
Ytai Ben-Tsvi
64027cbd0b Add sthal_cli_3
This is a command-line HAL mock, which registers as an AIDL HAL.

Change-Id: Idab4c6298bbdd7dafc360c50ac519efb7066cd0e
2021-03-30 12:37:29 -07:00
Ytai Ben-Tsvi
fb55702452 Introduce soundtrigger HAL v3
This is the initial AIDL version of the soundtrigger HAL.
It is functionally equivalent to v2.4 (HIDL), but with a clean-up
interface that removes obsolete / legacy functionality and conforms to
AIDL style.

Test: Mocked the HAL and observed framework logs for basic use-cases.
Change-Id: I4525301ad1205cf41937a98b7b9f67f052cb5bd9
2021-03-30 12:37:29 -07:00
Bob Badour
cc62c0b2a2 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  camera/device/3.7/Android.bp
  camera/provider/2.7/Android.bp
  soundtrigger/2.4/Android.bp
  soundtrigger/2.4/cli/Android.bp
  soundtrigger/2.4/vts/functional/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ibb3fc9cd32846ad8359f4e6b5f4460c3b54d4a36
2021-03-22 16:31:19 -07:00
Mikhail Naganov
7b50bebe90 Merge "audio: Update OWNERS" am: 2ad6484fc7 am: c5fb904fb7 am: 73bf722993 am: ef152f274b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1646456

Change-Id: I6af61a81549b0ea42287c66732f1aced344dd061
2021-03-19 19:16:03 +00:00
Mikhail Naganov
ef152f274b Merge "audio: Update OWNERS" am: 2ad6484fc7 am: c5fb904fb7 am: 73bf722993
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1646456

Change-Id: Ide8d35721fd9f9cbb90c243759648b30b262db78
2021-03-19 18:43:42 +00:00
Mikhail Naganov
c12d5adea8 audio: Update OWNERS
Add missing OWNERS files for default implementation and
utilities code.

Remove krocard@, add ytai@ to ST HAL default implementations.

Test: N/A
Change-Id: I22734cd7382c0988d0c6001164deb775e9ae55c0
2021-03-18 23:28:58 +00:00
Ytai Ben-Tsvi
b97a2512eb Move sthal_cli under 2.4
This version is specifically a mock of STHAL 2.4, so it makes more
sense to put it under 2.4 and name it as such.

I intend to add a separate mock for the AIDL version, so making sure
the two don't collide.

Test: Ran the mock HAL and manually verified operation.
Change-Id: Ica8e53b981d73737bfb1720628592e650fc86ee0
2021-03-18 16:12:01 -07:00