Commit Graph

46270 Commits

Author SHA1 Message Date
Devin Moore
7e102a4e41 Merge "Update vibrator example extension aidl_interface with versions_with_info" am: 19dfc6525c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2498576

Change-Id: I57b953a25cac542eb04e8ab19599478093d35e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 16:14:53 +00:00
Devin Moore
19dfc6525c Merge "Update vibrator example extension aidl_interface with versions_with_info" 2023-03-22 15:35:28 +00:00
Devin Moore
caca1dbc80 Update vibrator example extension aidl_interface with versions_with_info
This info is needed to know when the imports change between versions.
Set a good example.

Test: m
Bug: 273585373
Change-Id: I3f34711e99b09b611d68af522e2103a7cf768d63
2023-03-21 16:08:08 +00:00
Treehugger Robot
d4d38f8116 Merge "Update common.fmq aidl_interface with versions_with_info" am: 35d4efc9e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2498935

Change-Id: I13a7c35d2147b23fa4a6412f7df99200806c321e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:55:04 +00:00
Treehugger Robot
35d4efc9e9 Merge "Update common.fmq aidl_interface with versions_with_info" 2023-03-21 01:22:34 +00:00
Devin Moore
777a0bc5f7 Update common.fmq aidl_interface with versions_with_info
This info is needed to know when the imports change between versions.

Test: m
Bug: 273585373
Change-Id: Iec383ec1cb46a65a8733760219863838d4daf30a
2023-03-20 23:47:49 +00:00
Treehugger Robot
3ce3ee6427 Merge "Revert "graphics: improve preloading for IMapper default impl"" am: aab958fef0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2497376

Change-Id: I76feee415c170dc377424b1dbe64ed3afa1e2ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 18:23:46 +00:00
Treehugger Robot
aab958fef0 Merge "Revert "graphics: improve preloading for IMapper default impl"" 2023-03-20 18:09:12 +00:00
Seth Moore
0eaa396dc0 Merge "Note the relationship of patchlevels with keymint" am: 58686e5882
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2496162

Change-Id: Ie95626886c4631bd6a950de9d2118fdf3257d820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 18:07:05 +00:00
Seth Moore
58686e5882 Merge "Note the relationship of patchlevels with keymint" 2023-03-20 17:32:01 +00:00
Chia-I Wu
7ca92515be Revert "graphics: improve preloading for IMapper default impl"
This reverts commit 6d189b71a2.

Reason for revert: b/273884219, beagle_x15

Change-Id: I9706fc46f9aedbeb4bbcff7ebcb45939bcd20680
2023-03-20 16:36:56 +00:00
sangweilin
ab8e9f1b2b catch mutex when notify sampling rate changed, otherwise signal may be lost am: e1e361ed43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2496635

Change-Id: I43f3932449efa3dbbc530a8050dc7b4c72328dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 15:27:18 +00:00
sangweilin
e1e361ed43 catch mutex when notify sampling rate changed, otherwise signal may be lost
Change-Id: Ib52f26e731808ecbe5fd2a53fcd8a47ab3882902
Signed-off-by: sangweilin <sangweilin@xiaomi.com>
2023-03-19 06:48:32 +00:00
Shunkai Yao
5fc0541903 Merge "Update EffectUUID initialization" am: b1b8b68316
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2470684

Change-Id: I826fbaf3c66153af40f3ae205bda1c7d1c98f2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19 00:15:20 +00:00
Shunkai Yao
b1b8b68316 Merge "Update EffectUUID initialization" 2023-03-18 23:36:42 +00:00
Seth Moore
192c575ffb Note the relationship of patchlevels with keymint
Some of the DeviceInfo must match existing tags in KeyMint, but this
was not documented.

Test: n/a
Change-Id: I7733e2a4b0c08b0b89ece41390c0ce0711459d82
2023-03-17 15:36:11 -07:00
Seth Moore
ec275b18d7 Merge "Add old DeviceInfo version documentation" am: d0c02789ad
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2494236

Change-Id: I4d35ad0815fcacf6c604711823df826e1ea2d969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:31:26 +00:00
Seth Moore
d0c02789ad Merge "Add old DeviceInfo version documentation" 2023-03-17 20:48:35 +00:00
Vlad Popa
689c34e8cb Merge "CSD: rename get/setOutputRs2 to include upper bound" am: 429e51f4e7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2494661

Change-Id: Ic70dc25728118482771d001eb423d89f33479f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:40:00 +00:00
Vlad Popa
429e51f4e7 Merge "CSD: rename get/setOutputRs2 to include upper bound" 2023-03-17 19:12:45 +00:00
Shunkai Yao
f8be1acde7 Update EffectUUID initialization
Avoid dynamic initialization global UUID variables

Bug: 271500140
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I7574c1fe1ba0aaff1d9d29a9eed10de1aef33806
2023-03-17 18:16:22 +00:00
Mikhail Naganov
f9199100ac Merge "Update visibility of libaudioserviceexampleimpl" am: 1120ee5603
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2490615

Change-Id: Ib224a9f7c98ea69197ff45f982ea45ee2a7e0142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:28:51 +00:00
Mikhail Naganov
1120ee5603 Merge "Update visibility of libaudioserviceexampleimpl" 2023-03-17 16:55:05 +00:00
Anthony Stange
2d4fc27b55 Merge "Sensor:Add sensor type HINGE_ANGLE to function assertTypeMatchStringType" into android13-tests-dev am: 2550e7a719 am: 4ad422e74d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486876

Change-Id: Ib63a707c7ae534511409d8af027aaf16019653cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:37:20 +00:00
Anthony Stange
4ad422e74d Merge "Sensor:Add sensor type HINGE_ANGLE to function assertTypeMatchStringType" into android13-tests-dev am: 2550e7a719
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486876

Change-Id: Ie628fc877fd63dbe3b8c96d335416b2c741f1c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:02:43 +00:00
Anthony Stange
2550e7a719 Merge "Sensor:Add sensor type HINGE_ANGLE to function assertTypeMatchStringType" into android13-tests-dev 2023-03-17 14:33:01 +00:00
Jack Yu
b6f0fe18b0 Used LTE bands for network scan am: 87abf6a366 am: ba41b92e54
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2493495

Change-Id: Ic65eecc462e32fc847aca84c2ffbb4d9004f7554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:51:35 +00:00
Jack Yu
ba41b92e54 Used LTE bands for network scan am: 87abf6a366
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2493495

Change-Id: I437d499c79368cbc6a35c9a730bbcc94adde8060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:16:19 +00:00
Vlad Popa
4d7aa9279b CSD: rename get/setOutputRs2 to include upper bound
RS2 represents an interval of power levels. This is why it is clearer to
specify upper bound in the naming to make it clear that we refer to the
upper limit which when exceeded will trigger a momentary exposure.

Test: atest VtsHalAudioCoreTargetTest
Bug: 273961110
Change-Id: If4e065deeedb32c3e5e81caf4cd6924fb5815dc0
Merged-In: If4e065deeedb32c3e5e81caf4cd6924fb5815dc0
2023-03-17 02:57:47 +01:00
Jack Yu
87abf6a366 Used LTE bands for network scan
Test with LTE bands, which are supported by every device
in the world.

Bug: 271642958
Test: atest VtsHalRadioTargetTest
Change-Id: Ibc71a69b1a9aeec506a35fac9f64ecad80371155
2023-03-17 00:05:34 +00:00
Seth Moore
47194fa089 Add old DeviceInfo version documentation
Since comments are stripped from the stable AIDL snapshots, the CDDL
describing the DeviceInfo contents is lost for the older versions. Add
the comments from older DeviceInfo versions as a reference for
maintainers of older HAL implementations.

Test: n/a
Change-Id: I7dd3d285b3d8422a6df4228ad0cf5797e78609c1
2023-03-16 16:24:57 -07:00
Dezhi Huang
b5425cb909 Sensor:Add sensor type HINGE_ANGLE to function assertTypeMatchStringType
Function assertTypeMatchStringType does not match the sensor type
HINGE_ANGLE that only exists on folding screen phones. When testing the
VtsAidlHalSensorsTargetTest on a folding screen mobile phone,
it will fail.
So we need add CHECK_TYPE_STRING_FOR_SENSOR_TYPE(HINGE_ANGLE) to
the function assertTypeMatchStringType.

Bug: 270831199
Change-Id: Ib82a1168ff90d851eee6ce025464b11bcda7d5ca
2023-03-16 01:55:31 +00:00
AOYAGI Takako
2bddcd6006 Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566 am: 16b926e728 am: e760f283cc am: 64412bb9cd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486695

Change-Id: I2c2e94c0d94e958e0c8b326484376255ea7bac29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 01:25:09 +00:00
AOYAGI Takako
64412bb9cd Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566 am: 16b926e728 am: e760f283cc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486695

Change-Id: I48186f5bee46d4bb9486f42c0ce410450c51cc08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 00:47:32 +00:00
AOYAGI Takako
e760f283cc Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566 am: 16b926e728
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486695

Change-Id: I9d89b36e50daf41894930baeb7bc59f5d45d27a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 00:07:28 +00:00
AOYAGI Takako
16b926e728 Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9 am: c0fd000566
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486695

Change-Id: I5074deea886829be8ba8988377490f7d2ad2449b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 23:32:36 +00:00
AOYAGI Takako
c0fd000566 Fix for VTS test CleanupConnectionsOnInitialize am: 45a15ed8b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2486695

Change-Id: I105d3e8472f27f2d49a6ab675d173af739fca039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 22:54:22 +00:00
Steven Moreland
817bdea5fc rkp: add keymint v2 hash into rkp v2 am: 184f64bcee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2492259

Change-Id: Ie29e6e4360511670f9550d9d7eea7dded7c345e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 21:56:05 +00:00
AOYAGI Takako
45a15ed8b9 Fix for VTS test CleanupConnectionsOnInitialize
Sensor event never occur on DUT that has no sensor.
So, skip this test case on DUT that has no sensor.

Test: run vts -m VtsHalSensorsV2_0TargetTest

Bug: 273383821
Change-Id: I657b74ca3c67c105e40e58a7e4c700370a9db3e3
Signed-off-by: AOYAGI Takako <aoyagi.takako@jp.panasonic.com>
2023-03-15 21:50:31 +00:00
Steven Moreland
184f64bcee rkp: add keymint v2 hash into rkp v2
When we split the rkp interface, we only added one hash to rkp v2, but
on Android S devices, this interface was in keymint v2, and so it used
the keymint v2 hash.

In order for that old implementation to be recognized, we need to add the hash in specifically.

Note: v1 was missed in b/264549860, but this was v2.

Fixes: 271513408
Test: vts_treble_vintf_vendor_test
Change-Id: I58c7c41633000df933261a147edd3477afd09a36
2023-03-15 19:48:45 +00:00
David Zeuthen
a8139eaa3e [automerger skipped] identity: VTS: allow for multiple interpretations of AuthKey validity. am: 5993719991 am: c6ab70d754 -s ours am: 04935a3134 -s ours am: df1ec09244 -s ours
am skip reason: Merged-In Iedb9caad933b0df2b190915f5cc7177e507f15b5 with SHA-1 a6fc69d339 is already in history

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

Change-Id: If228051a2ca7364116d7658087d6b23cc4a507be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 19:02:02 +00:00
David Zeuthen
df1ec09244 [automerger skipped] identity: VTS: allow for multiple interpretations of AuthKey validity. am: 5993719991 am: c6ab70d754 -s ours am: 04935a3134 -s ours
am skip reason: Merged-In Iedb9caad933b0df2b190915f5cc7177e507f15b5 with SHA-1 a6fc69d339 is already in history

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

Change-Id: I07499986bb76c3a746daa8d338d5575aacc78009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 18:26:13 +00:00
David Zeuthen
04935a3134 [automerger skipped] identity: VTS: allow for multiple interpretations of AuthKey validity. am: 5993719991 am: c6ab70d754 -s ours
am skip reason: Merged-In Iedb9caad933b0df2b190915f5cc7177e507f15b5 with SHA-1 a6fc69d339 is already in history

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

Change-Id: I102eb9702ba55f190cd59c46afabd3f8f9eac738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 18:04:33 +00:00
David Zeuthen
c6ab70d754 identity: VTS: allow for multiple interpretations of AuthKey validity. am: 5993719991
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2489995

Change-Id: I89b208ea35edc6a487d38ced395ae62bcc549019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 17:30:25 +00:00
Mikhail Naganov
776e65e35f Update visibility of libaudioserviceexampleimpl
In order for vendors to be able to use this library
it needs to have public visibility.

Bug: 205884982
Test: m
Change-Id: Idd47c942ee1e97372047ec1b44bcd996d454e3e2
2023-03-15 09:29:16 -07:00
David Zeuthen
5993719991 identity: VTS: allow for multiple interpretations of AuthKey validity.
Bug: 271948315
Test: atest VtsHalIdentityTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:719920700e0e8c0849ef25eeaad8de2bf2442b6e)
Merged-In: Iedb9caad933b0df2b190915f5cc7177e507f15b5

Change-Id: I6599499e08db91729fe6898dbfa5ecb77450d11e
2023-03-15 14:01:50 +00:00
Treehugger Robot
f226c32192 Merge "Add new reason code and status code for session conflict." am: 5e289765fa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2484904

Change-Id: Idd381649c38b742d216344d8c6cefbef6cda2295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 03:04:15 +00:00
Treehugger Robot
5e289765fa Merge "Add new reason code and status code for session conflict." 2023-03-15 02:03:59 +00:00
Treehugger Robot
fea8a10a27 Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518 am: 368ca264f2 am: fee45b6dbb am: ebd7b7afb8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289

Change-Id: I8f8898784b7f0fb0b1f315e7c977870377150cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:01:24 +00:00
Treehugger Robot
ebd7b7afb8 Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518 am: 368ca264f2 am: fee45b6dbb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289

Change-Id: If81bfd72c984aed3ff5bdd281995413b4825c747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:00:54 +00:00