Commit graph

54921 commits

Author SHA1 Message Date
Steven Moreland
0c72245836 Merge "OMX: allow in 8" into main 2023-10-16 21:50:36 +00:00
Roshan Pius
1561fd933b Merge "nfc(hal): Make it available for nfc apex" into main 2023-10-16 18:31:01 +00:00
Zhanglong Xia
eec8babbd7 Merge "update the thread_radio based on latest definition of SpinelInterface" into main 2023-10-16 03:29:27 +00:00
Jooyung Han
62ba8b5bbe Merge "Cleanup: use shared apex_key (vibrator HAL APEX)" into main 2023-10-16 01:19:52 +00:00
Yu Shan
1e6cbc533f [automerger skipped] Allow CDD required properties to be absent in VTS. am: da7a4ddabd -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 8a1ab8705d is already in history

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

Change-Id: I0c7440fa5c47137625722c8e5c8632c47e820f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-14 00:09:45 +00:00
Mikhail Naganov
03a2fbc6a3 Merge changes from topic "revert-2770886-AidlAudioHalModuleConfig-FQCMWOWMCH" into main
* changes:
  Revert "audio: Parse module configurations from the APM XML files"
  Revert "audio: Populate MicrophoneInfo with vendor data"
  Revert "audio: Set connectedProfiles for non-attached device ports."
  Revert "audio: Use hardcoded r_submix configuration with XML"
2023-10-13 23:44:26 +00:00
Mikhail Naganov
af75a679c9 Revert "audio: Parse module configurations from the APM XML files"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I0076c88877943d9498f90c477e78a2be5d390150
2023-10-13 23:38:25 +00:00
Mikhail Naganov
5eea7fb0d7 Revert "audio: Populate MicrophoneInfo with vendor data"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I01a4d22056507f9047c4fead21c9a75bfa153a46
2023-10-13 23:38:25 +00:00
Mikhail Naganov
006a136ea7 Revert "audio: Set connectedProfiles for non-attached device ports."
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: Id325171baeabd61d244e5f15c37f7d14402bd426
2023-10-13 23:38:25 +00:00
Mikhail Naganov
567d0de485 Revert "audio: Use hardcoded r_submix configuration with XML"
Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I7f51ab94f5d42ac052e9900ddd0cc69a33856820
2023-10-13 23:38:25 +00:00
Steven Moreland
47b0223eaa OMX: allow in 8
Bug: 293538526
Change-Id: Ieda8e14d23c367c18537d79c28aeea8a9efbec53
Test: N/A
(cherry picked from commit ab586ba7d3)
2023-10-13 22:16:25 +00:00
Roshan Pius
e89c71773d nfc(hal): Make it available for nfc apex
Bug: 303286040
Test: Compiles
Merged-In: I2d70f751867fe02ba2bc6958963e30f128630b00
Change-Id: I2d70f751867fe02ba2bc6958963e30f128630b00
2023-10-13 18:03:41 +00:00
Treehugger Robot
43543bda62 Merge changes from topic "AidlAudioHalModuleConfig" into main
* changes:
  audio: Use hardcoded r_submix configuration with XML
  audio: Set connectedProfiles for non-attached device ports.
  audio: Populate MicrophoneInfo with vendor data
  audio: Parse module configurations from the APM XML files
2023-10-13 16:33:46 +00:00
Alan Stokes
8cbbc15bc3 Give a name to the ConfigurationDescriptor.
Test: N/A
Change-Id: Ia2f4198e97a61494ba50e46fd198ee1f1ad44f0d
2023-10-13 13:43:21 +00:00
David Drysdale
57d13b5d83 Merge "RSA OAEP MGF1 digest VTS relaxed for keymint < V3" into main 2023-10-13 10:28:03 +00:00
Wei Wang
f5150886a8 Merge "Cleanup: remove unused old thermal APEX" into main 2023-10-13 05:07:04 +00:00
Treehugger Robot
df8b2e8478 Merge "Update haptics framework owners file" into main 2023-10-12 09:26:38 +00:00
Zhanglong Xia
5cc95e3373 update the thread_radio based on latest definition of SpinelInterface
OpenThread has changed the functions of SpinelInterface, which
causes the build errors of the Thread HAL service. This commit
updates the thread_radio based on the latest definition of
SpinelInterface.

Bug: b/304914440
Test: Build and run Thread stack on cuttlefish.
Change-Id: Ie92aedc925c771748424bdbae0ae1d340b154bb2
2023-10-12 15:26:50 +08:00
Mikhail Naganov
ea604d50de audio: Use hardcoded r_submix configuration with XML
There are several reasons why parsing the canonical XML
configuration for the remote submix module will not work
correctly (see the commend in the code).

Since de facto all vendors use the canonical configuration
XML for the remote submix, substitute parsing it with
a correct hardcoded version.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iddebf9baa73e8dc90ada1c9b1783c513abb59420
2023-10-11 19:38:49 -07:00
Lorena Torres-Huerta
a29393db39 audio: Set connectedProfiles for non-attached device ports.
For external (non-attached) device ports that have dynamic
profiles, 'connectedProfiles' must be provided. They are
used when 'ModuleDebug.simulateDeviceConnections' is enabled.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ic82e47abc50e2958ed93f5d4d18082b569ecb67b
2023-10-11 19:38:12 -07:00
Lorena Torres-Huerta
dc9d1a4b42 audio: Populate MicrophoneInfo with vendor data
Added a virtual method Module::getMicrophoneInfos
so that vendor implementations can provide actual
data about device microphones. This information
is not part of the APM config file.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTestTest
Change-Id: I4b650ae221ba866421bbf8500ad8c17f04bc4aa7
2023-10-11 19:36:38 -07:00
Lorena Torres-Huerta
00a7307862 audio: Parse module configurations from the APM XML files
The default implementation now loads the HAL configuration
from the legacy XML configuration file which was previously
consumed by the framework directly.

Note that errors in the config file will lead to crash
of the XML parser, pointing out to the source of the problem.

IMPORTANT NOTES:
  - Never use untested legacy config files with production
    devices.
  - Make sure that all possible configurations (for example,
    BT offload on/off) are tested.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I01e4cd77a284d7df64ecb0c0b21cb16abfa0f6c5
2023-10-11 18:31:25 -07:00
Treehugger Robot
9c93cbe987 Merge "Update media OWNERS file" into main 2023-10-11 23:50:15 +00:00
Devin Moore
d2f5f95f51 Update media OWNERS file
Test: none
Bug: none
Change-Id: Idf00ac904a3358d56e002650d0ef519e123f5678
2023-10-11 22:14:42 +00:00
Yu Shan
816e644a44 Merge "Allow CDD required properties to be absent in VTS." into main 2023-10-11 19:57:36 +00:00
Yu Shan
da7a4ddabd Allow CDD required properties to be absent in VTS.
Allow CDD required properties not to be supported in VHAL VTS since
this is already covered in CTS. We also need to consider special
cases where one VHAL instance does not support all required
properties.

Test: atest VtsHalAutomotiveVehicle_TargetTest
Bug: 301577794
Merged-In: I93020e7e024760601bc5a8edf9997cc356a568c6
Change-Id: I93020e7e024760601bc5a8edf9997cc356a568c6
2023-10-11 19:56:52 +00:00
Yu Shan
8a1ab8705d Allow CDD required properties to be absent in VTS.
Allow CDD required properties not to be supported in VHAL VTS since
this is already covered in CTS. We also need to consider special
cases where one VHAL instance does not support all required
properties.

Test: atest VtsHalAutomotiveVehicle_TargetTest
Bug: 301577794
Merged-In: I93020e7e024760601bc5a8edf9997cc356a568c6
Change-Id: I93020e7e024760601bc5a8edf9997cc356a568c6
(Cherry-picked from commit b84f6f3c68fcd7f613146146821130eb354865c1)
2023-10-11 18:46:56 +00:00
David Zhao
c705c2195a Update TV owners
VTS check doesn't like it if there's no component in the OWNERS file.

Test: mmm
Change-Id: I46fe7e30032802640216cd6f5fbeabc97b09a085
2023-10-11 17:47:56 +00:00
Mikhail Naganov
e3dcd057d9 Merge "audio: Allow "dynamic" profiles for device ports" into main 2023-10-11 17:32:22 +00:00
Jooyung Han
fa2dd8e2ad Merge "Revert^2 "Add bootcontrol HAL APEX"" into main 2023-10-11 04:20:38 +00:00
Jooyung Han
6693205f17 Merge "Cleanup: use shared apex_key" into main 2023-10-11 03:41:11 +00:00
Jooyung Han
3876680a8b Merge "Cleanup: use shared apex_key" into main 2023-10-11 03:40:34 +00:00
Mikhail Naganov
84bcc049e6 audio: Allow "dynamic" profiles for device ports
Some device ports are connected via ADSP which takes care
of the actual audio configuration (format, channels, SR),
for example the built-in speaker and mic ports, as well
as some external devices like analog headsets.

In the legacy implementation, such device ports did not have
any profiles specified. Allow the same behavior in the AIDL
implementation. To ensure correctness, device ports with no
profiles must be routable to mix ports that have profiles
specified. This requirement is fulfilled in legacy configs.

Bug: 266124463
Test: atest VtsHalAudioCoreTargetTest
Test: atest audiosystem_tests audiorouting_tests
Test: atest CtsMediaAudioTestCases
Change-Id: Iaccd1e8ef2a5af9a5f8bae453905d01c6b7fdc28
2023-10-10 15:15:50 -07:00
Jason Macnak
b8c23a8a7d Merge "Ensure AIMapper and underlying IMPL outlive IMapperProvider" into main 2023-10-10 21:49:10 +00:00
Jason Macnak
7d201b58fa Ensure AIMapper and underlying IMPL outlive IMapperProvider
... as a

  static vendor::mapper::IMapperProvider<IMPL> provider;

may be destructed during a clean process exit (during __cxa_finalize())
but the underlying IMPL may still be in use on other threads.

Bug: b/304343434
Test: boot Cuttlefish
Change-Id: I80687494c61210d527908b5a67375950ca45c8ea
2023-10-10 11:54:00 -07:00
Prashant Patil
2114dca2aa RSA OAEP MGF1 digest VTS relaxed for keymint < V3
Since there were no VTS test to strictly check RSA_OAEP_MGF_DIGEST,
there are released devices with Keymint which do not include this tag in
key characteristics, hence these test fails on such Keymint and UDC
Android framework.

Hence version check is added before asserting MGF digest checks.

Bug: 297306437
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I43054f8dbbd46de53deef5e6771c736e770280e0
2023-10-10 10:03:30 +00:00
Jooyung Han
83f5cfc36d Cleanup: use shared apex_key (vibrator HAL APEX)
plus, moved VINTF fragment into VAPEX

Bug: 296524155
Test: m
Change-Id: I1453174ab8229af56cff5886126de77eb9129ed7
2023-10-10 16:08:22 +09:00
Jooyung Han
68169109d0 Cleanup: remove unused old thermal APEX
Bug: n/a
Test: m
Change-Id: I3244eafa2e97736a3767a7c21d806dd5e5d742fc
2023-10-10 14:07:06 +09:00
Jooyung Han
9aaa45eb6b Cleanup: use shared apex_key
plus, moved VINTF fragments into VAPEX

Bug: 296524155
Test: m
Change-Id: I8adac4c00a98d1fd7c71aa92851567a35d9dabf3
2023-10-10 13:53:36 +09:00
Jooyung Han
3d66ca3689 Cleanup: use shared apex_key
Bug: 296524155
Test: m
Change-Id: I353d4803d0e6bd16d4a5617ca7790d33ff589747
2023-10-10 13:46:47 +09:00
Jooyung Han
cadd26dbe7 Cleanup: move VINTF fragments into VAPEX
VINTF fragments for Power VAPEX were installed in /vendor/etc as a
workaround when VINTF fragments in VAPEX were not supported.

Bug: n/a
Test: m && launch_cvd
      # power/power-stat services are running
Change-Id: I0243a0bd2f2dd597260f73a3994cf81db213daf7
2023-10-10 12:46:33 +09:00
Jooyung Han
a0b0a624ff Cleanup: use shared apex_key
Bug: 296524155
Test: m
Change-Id: I2b722872d1a93952186a38a385a3e0cd1869b7f5
2023-10-10 10:47:36 +09:00
Lais Andrade
ecc4631caa Update haptics framework owners file
Bug: 304194677
Change-Id: I387ac57b76dd2aab19d485a1964927be3d709009
Test: N/A
2023-10-09 11:55:22 +00:00
Krzysztof Kosiński
13de1b68b4 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I0cb0dd70d7aaa1a2388f725f3365ffff6dbc3b37
2023-10-07 00:48:10 +00:00
Xin Li
a737141254 Merge "Merge Android 14" into main 2023-10-06 05:34:12 +00:00
Treehugger Robot
df7f1d5f60 Merge "media.c2 aidl: change minSdk to 30" into main 2023-10-06 01:54:31 +00:00
Henri Chataing
ed2acd8952 Merge "UWB: Cleanup in default HAL" into main 2023-10-06 00:11:30 +00:00
Henri Chataing
7e798080c8 UWB: Cleanup in default HAL
Resolve comments on I8ad8072fe01c8d1f466d8debf0ccf5831b3eddf8

Bug: 302005209
Test: m android.hardware.uwb-service
Change-Id: I1c4348fa7548441555c46cac88c2e5787d764f03
2023-10-06 00:11:08 +00:00
Xin Li
0321b51e3d Merge Android 14
Bug: 298295554
Merged-In: I2cb5194acbe64d7d64cca9b245b26ca5fbac35d4
Change-Id: I08423a3b9bf283262c2945f58078f6e0b614707e
2023-10-05 15:41:01 -07:00
Tomasz Wasilczyk
19f00f8964 Merge "Don't depend on String8 cast to C string [drm]" into main am: 15272cf28e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748300

Change-Id: I560a707f4167057cc45f824fca9e96286c48a6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:23:41 +00:00