Commit Graph

54769 Commits

Author SHA1 Message Date
Treehugger Robot
cb1900c8a7 Merge "audio: Match the r_submix configuration to the legacy impl" into main am: 65747f7ccb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2755271

Change-Id: I480ad6a21f409bdbe86096ee38916ed6e4ba2c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:51:28 +00:00
Jooyung Han
a4f82631a2 Merge "Revert^2 "Add CAS HAL APEX"" into main am: d67ffc4b89
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2752545

Change-Id: I786dad36c8e68a3e9c8dec87f1ebd2ed4511d44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:50:45 +00:00
Treehugger Robot
65747f7ccb Merge "audio: Match the r_submix configuration to the legacy impl" into main 2023-09-19 01:49:27 +00:00
Jooyung Han
d67ffc4b89 Merge "Revert^2 "Add CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Mikhail Naganov
21d4b9608a audio: Match the r_submix configuration to the legacy impl
The legacy configuration was interesting because although the
xml config file only listed 48000 Hz SR and
AUDIO_CHANNEL_OUT_STEREO channel mask, the implementation
allowed a range of SRs and MONO channel mask. The framework was
liberally allowing requests for other SRs to go to the r_submix
HAL, even without having them listed in the xml config
file. However, since libaudiohal@aidl is more strict in matching
configuration requests to port capabilities, we need to list all
channels masks and SRs suported by the legacy HAL explicitly.

However, we need to limit the amount of profiles to avoid
extra load when passing them via AudioPolicyService.listAudioPorts,
thus remove other PCM types.

Also, to match the hard limit on the number of routes in the legacy
implementation, set "maxOpen/ActiveStreamCount" for mix ports.

Bug: 286914845
Bug: 300990644
Test: atest VtsHalAudioCoreTargetTest
Test: atest android.media.audio.cts.AudioPlaybackCaptureTest
Change-Id: I4a8c7d016662d92ab5e73bc67d94aaac6570e59a
2023-09-18 17:35:52 -07:00
Mikhail Naganov
f494fb43a9 Merge "audio: Improve testing of point-to-point connections" into main am: 049a82e5d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753112

Change-Id: I2bd9cef92786b85abe73d6092ea6960ec8c27d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 17:06:02 +00:00
Mikhail Naganov
049a82e5d9 Merge "audio: Improve testing of point-to-point connections" into main 2023-09-18 16:32:39 +00:00
David Drysdale
069412e781 Merge "KeyMint: clarify EC_CURVE on import" into main am: a2d3f2499c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740353

Change-Id: Ie52807c884e5e52ac07845ae8e0275a0eacba2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 16:11:40 +00:00
David Drysdale
a2d3f2499c Merge "KeyMint: clarify EC_CURVE on import" into main 2023-09-18 15:00:57 +00:00
Treehugger Robot
68d44aa5e2 Merge "Camera VTS: Verify high speed video configurations" into main am: 607f7e7ff7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585399

Change-Id: Ib20ae0eb0bc7466acb39e7eb0409fde8641f6070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 08:04:22 +00:00
Treehugger Robot
607f7e7ff7 Merge "Camera VTS: Verify high speed video configurations" into main 2023-09-18 07:28:16 +00:00
Jooyung Han
9efe22d70a Merge "Add memtrack HAL APEX" into main am: eb98a19968
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751969

Change-Id: I2b34c8c633eb644d2a09daded33f996f6bc5e26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 02:39:45 +00:00
Jooyung Han
eb98a19968 Merge "Add memtrack HAL APEX" into main 2023-09-18 01:36:33 +00:00
Mikhail Naganov
fe47b00628 audio: Improve testing of point-to-point connections
Point-to-point connections (analog, HDMI, SPDIF) do not use
a device address. Reflect that in `GenerateUniqueDeviceAddress`.
Add an analog headset into the test configuration.

Bug: 300648357
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Id1d0b1b60df40c2474fe3151067152b8e0a261c3
2023-09-15 18:58:17 -07:00
Sarah Chin
8ec739eb5b [automerger skipped] Update VTS tests with EUTRAN instead of GERAN am: e6c4be215a -s ours am: baf5a2c4ff -s ours
am skip reason: Merged-In Ib36b171e33451bf0c9adc0b065a4c74df357e77e with SHA-1 947f486737 is already in history

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

Change-Id: Ibd4861113e9731c95ec443b9310b4f47e63774b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 01:23:48 +00:00
Sarah Chin
baf5a2c4ff [automerger skipped] Update VTS tests with EUTRAN instead of GERAN am: e6c4be215a -s ours
am skip reason: Merged-In Ib36b171e33451bf0c9adc0b065a4c74df357e77e with SHA-1 947f486737 is already in history

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

Change-Id: I88b4a1d105a917aafef1256fb0e63a06af00ef6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 00:19:51 +00:00
Sarah Kim
80000b39d6 Merge "Update VTS tests with EUTRAN instead of GERAN" into main am: 481316f2d6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2745917

Change-Id: I47915bf6d59afe8c799d4fdeac3deaa238935b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:45:06 +00:00
Sarah Chin
c8c4ad31b7 [automerger skipped] Fix broken and flaky VTS tests am: d3f69217e0 -s ours am: 6b5472fa72 -s ours
am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 7f3bd1792f is already in history

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

Change-Id: I782a4752af0c9c5431825f31888e038ca6ae34c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:43:42 +00:00
Sarah Kim
481316f2d6 Merge "Update VTS tests with EUTRAN instead of GERAN" into main 2023-09-15 21:59:58 +00:00
Sarah Chin
6b5472fa72 [automerger skipped] Fix broken and flaky VTS tests am: d3f69217e0 -s ours
am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 7f3bd1792f is already in history

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

Change-Id: I03dbd0f596081c528978214a3888c82f72e4e3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:38:45 +00:00
Sarah Chin
e6c4be215a Update VTS tests with EUTRAN instead of GERAN
These tests were created for IRadio 1.2 when all devices supported GSM,
and REQUEST_NOT_SUPPORTED was valid for devices that didn't support GSM. Change the VTS logic to test EUTRAN instead of GERAN.
Remove REQUEST_NOT_SUPPORTED for tests now without GERAN and add REQUEST_NOT_SUPPORTED for all GERAN-specific tests.

Test: atest VtsHalRadioTargetTest
Bug: 294965245
Change-Id: Ib36b171e33451bf0c9adc0b065a4c74df357e77e
Merged-In: Ib36b171e33451bf0c9adc0b065a4c74df357e77e
2023-09-15 21:10:07 +00:00
Sarah Chin
947f486737 Update VTS tests with EUTRAN instead of GERAN
These tests were created for IRadio 1.2 when all devices supported GSM,
and REQUEST_NOT_SUPPORTED was valid for devices that didn't support GSM. Change the VTS logic to test EUTRAN instead of GERAN.
Remove REQUEST_NOT_SUPPORTED for tests now without GERAN and add REQUEST_NOT_SUPPORTED for all GERAN-specific tests.

Test: atest VtsHalRadioTargetTest
Bug: 294965245
Change-Id: Ib36b171e33451bf0c9adc0b065a4c74df357e77e
Merged-In: Ib36b171e33451bf0c9adc0b065a4c74df357e77e
2023-09-15 21:10:01 +00:00
Sarah Chin
d3f69217e0 Fix broken and flaky VTS tests
1. nvResetConfig takes some time to reset the modem, causing subsequent
   tests to fail with a timeout since the modem is unavailabe.
   Add a timeout after nvResetConfig to allow the modem to be up again
   before running the next test.
2. Remove invalid errors for start/stopKeepalive. These tests should
   fail due to invalid arguments, so remove NONE as a possible error.
   RADIO_NOT_AVAILABLE should also be removed.
3. Fix incorrect startNetworkScan_InvalidInterval tests, since we only
   check the interval when the scan type is PERIODIC.
4. Save and reset the previous allowed network type bitmap after the
   test. Combine get/set into one test that tests both behaviors.
5. Fix checks for MCC/MNC in getDataRegistrationState

Bug: 277626718
Bug: 240953393
Bug: 264913330
Bug: 259674407
Bug: 242801688
Test: atest VtsHalRadioTargetTest
Change-Id: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
Merged-In: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6
(cherry picked from commit ddaea2e5a4)
2023-09-15 20:08:27 +00:00
David Drysdale
e865448a4e Merge "KeyMint VTS: re-order auth failure arms" into main am: 2ef3749cba
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2750968

Change-Id: I03e4e696611bee62c71fc6e50fea8136329e1510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 11:04:31 +00:00
David Drysdale
60a02ab943 Merge "KeyMint: check missing EC_CURVE on v3+" into main am: c91d05699f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2750972

Change-Id: Ibe592cb6ba1b9107ea6972fa085dad9a4a89154e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 11:04:07 +00:00
David Drysdale
2ef3749cba Merge "KeyMint VTS: re-order auth failure arms" into main 2023-09-15 10:36:47 +00:00
David Drysdale
c91d05699f Merge "KeyMint: check missing EC_CURVE on v3+" into main 2023-09-15 09:59:25 +00:00
Kwangkyu Park
4b7fd45612 Camera VTS: Verify high speed video configurations
Verify high speed video configurations based on the tag definition.

Bug: 274392420
Test: Ran on cuttlefish
Change-Id: Ie64415cc8694d8f4da59a01f6051bc847ae30fa7
2023-09-15 14:10:09 +09:00
Jooyung Han
70015f6c94 Add memtrack HAL APEX
Bug: 300011626
Test: VtsHalMemtrackTargetTest
Change-Id: Ibc4d8eda2264c19173dee4165ebd977257b3f3d5
2023-09-15 13:16:28 +09:00
Mikhail Naganov
e3b1829528 Merge "audio: Fix handling of external devices disconnection" into main am: a39e854ef5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751285

Change-Id: I3a293e643158e46881c8e574dc3ef38682a736a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 20:43:59 +00:00
Mikhail Naganov
a39e854ef5 Merge "audio: Fix handling of external devices disconnection" into main 2023-09-14 20:02:48 +00:00
Treehugger Robot
e20ecbd8a5 Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284

Change-Id: Ib0312240d25d3a4683429181949457535249657e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:57:55 +00:00
Treehugger Robot
02b33df6b8 Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main 2023-09-14 18:16:02 +00:00
Jooyung Han
5a3d588442 Revert^2 "Add CAS HAL APEX"
8b19286ce3

This relands the CAS HAL APEX.

Bug: 297467514
Test: atest CtsMediaMiscTestCases:MediaCasTest
Change-Id: I741d059688ac65f42bed45e068cd00ccc5d631f5
2023-09-15 00:17:30 +09:00
David Drysdale
9ed7d2c5bf KeyMint: check missing EC_CURVE on v3+
The original change to add this test didn't make it into the Android 13
version of the VTS test, so the version gate needs to be updated to be
v3+

Bug: 292318194
Test: VtsAidlKeyMintTargetTest --gtest_filter="*EcdsaMissingCurve*"
Change-Id: I94bf816688e57c7c04893a23cf0399129de94229
2023-09-14 15:16:27 +01:00
Sebastian Pickl
60423940fb Merge "Revert "Add CAS HAL APEX"" into main am: 38a85e778c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751047

Change-Id: I7d58fe5d762e6def2fc2d2000e7dc18cb8ef582c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 12:37:00 +00:00
Sebastian Pickl
38a85e778c Merge "Revert "Add CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
8b19286ce3 Revert "Add CAS HAL APEX"
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Reverted changes: /q/submissionid:2742398-cas-apex

Change-Id: Ia13d761d7df501fb30170a69462427198bcf924d
2023-09-14 12:25:33 +00:00
David Drysdale
a35699cb5c KeyMint VTS: re-order auth failure arms
Allow for devices that claim to need external timestamps, but don't.

Test: VtsAidlKeyMintTargetTest
Bug: 300211206
Change-Id: Ie450d9969c337d5274502f3600e14c0b481e8b34
2023-09-14 11:34:15 +01:00
Jooyung Han
e0c3fcbd9a Merge "Add OWNERS file for apexkey" into main am: d3c04fd6c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751163

Change-Id: I24d00b74494afeb90602ee958f5d92b3833359fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 04:06:24 +00:00
Jooyung Han
49122f7ddf Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into main am: 1f05f9d3a1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2749883

Change-Id: I906274b8309fc3fa24c09942a80a7380b5fd2665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 04:06:09 +00:00
Jooyung Han
3c7f6052ef Add tetheroffload HAL APEX am: d254e37e32
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2749882

Change-Id: I7cacb9c989b61d10243a93febdd16dfa99c5f261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 04:06:03 +00:00
Jooyung Han
d3c04fd6c3 Merge "Add OWNERS file for apexkey" into main 2023-09-14 03:56:08 +00:00
Jooyung Han
1f05f9d3a1 Merge changes from topics "tetheroffload-hal-apex", "thermal-hal-apex" into main
* changes:
  Add thermal HAL APEX
  Add tetheroffload HAL APEX
2023-09-14 03:39:36 +00:00
Eric Biggers
f1c8ac501f Merge "IWeaver.aidl: document that throttling must be per-slot" into main am: 2b2e880848
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751085

Change-Id: I06f889932e9fae83eee7b698afb52958445b08af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 03:15:19 +00:00
Sungtak Lee
22c2ea079b media.c2: Enable BaseBlock to parcel AHardwareBuffer
Enable c2 interface to send/receive AHardwareBuffer.

Test: m
Bug: 254050314
Change-Id: I3289d891fb0eae49652e3e88b77070f6762fc5b1
2023-09-14 03:04:47 +00:00
Mikhail Naganov
0e128dd3fe audio: Fix handling of external devices disconnection
A mix port can be patched to multiple connected device ports. Thus, when
disconnecting an external device and removing the connected port, the
profiles of the mix port can only be cleared iff there are no more
connected device ports patched to it, and it did not have profiles prior to
connection of the first device.

Enhanced VTS tests to catch this problem in the HAL implementations. Also,
ensure that audio ports and audio routes do not change after the test
finishes. This ensures that tests can't affect each other.

Bug: 298175108
Test: atest audiosystem_tests
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Ia666b874958fb260513fc2b8cd20a823953ec679
2023-09-13 19:41:46 -07:00
Eric Biggers
2b2e880848 Merge "IWeaver.aidl: document that throttling must be per-slot" into main 2023-09-14 02:40:30 +00:00
Devin Moore
331cdf4127 Add the "virtual" instance for face HAL retroactively am: f426201991
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751164

Change-Id: I0b9ddad3b8c1e53c947d6f2fbd9add87879b66a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 01:32:54 +00:00
Devin Moore
f426201991 Add the "virtual" instance for face HAL retroactively
Test: m
Bug: 300320120
Change-Id: I395865e9af3679d8cb6cd888dfc3438fa3389f95
2023-09-13 22:19:54 +00:00