Commit Graph

64070 Commits

Author SHA1 Message Date
Ryan Prichard
9705248d2a Merge changes Ic373e0a3,Icb3937d8 into main am: 600b93a0c2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2960244

Change-Id: Ib48370e9f5daf5a58100d5d12055612bb2a335c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 17:51:18 +00:00
Shunkai Yao
8fcfd41a72 Merge "Effect AIDL: add Spatializer default implementation to Cuttlefish" into main am: ac270bcbe2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2959644

Change-Id: Idfc6d94b03fd276eef06eae790f45918ea30048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 17:49:58 +00:00
Ryan Prichard
600b93a0c2 Merge changes Ic373e0a3,Icb3937d8 into main
* changes:
  Replace std::basic_string_view<uint8_t> with std::span
  Replace std::basic_string<uint8_t> with std::vector
2024-02-13 17:32:52 +00:00
Shunkai Yao
ac270bcbe2 Merge "Effect AIDL: add Spatializer default implementation to Cuttlefish" into main 2024-02-13 17:06:18 +00:00
Ryan Prichard
01cf20d711 Replace std::basic_string_view<uint8_t> with std::span
In newer versions of libc++, std::char_traits<T> is no longer defined
for non-character types, and a result, std::basic_string_view<uint8_t>
is also no longer defined. See
https://discourse.llvm.org/t/deprecating-std-string-t-for-non-character-t/66779.

Bug: 175635923
Test: libkeymint_remote_prov_support_test
Change-Id: Ic373e0a3c081b996d4c81a9783103ae6406833f7
2024-02-12 20:34:20 -08:00
Ryan Prichard
aecb0333b0 Replace std::basic_string<uint8_t> with std::vector
In newer versions of libc++, std::char_traits<T> is no longer defined
for non-character types, and a result, std::basic_string<uint8_t> is
also no longer defined. See
https://discourse.llvm.org/t/deprecating-std-string-t-for-non-character-t/66779.

Bug: 175635923
Test: make checkbuild
Change-Id: Icb3937d8b1ff6dbe7e35e62f2e6cc1e2eb789121
2024-02-12 20:15:47 -08:00
Shunkai Yao
c7f5c2dd83 Effect AIDL: add Spatializer default implementation to Cuttlefish
Bug: 273373363
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: Ib49d62c61de831c8147c935799d22be78950488f
2024-02-13 02:11:12 +00:00
Henri Chataing
f3a785b16d blueooth/audio/aidl/default: Disable GetProviderInfo am: 7f9c47a388
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2957054

Change-Id: Ia8e556e6cc1aa6c8b97ec896fe2ccfed2c36e74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 23:19:22 +00:00
Henri Chataing
7f9c47a388 blueooth/audio/aidl/default: Disable GetProviderInfo
This implementation of the HAL is used by pixel devices.
The implementation of GetProviderInfo is test only

Bug: 324570010
Test: TreeHugger
Change-Id: I67d17fb07c1288317290a0b1c4b07cd3be1e48c6
2024-02-12 18:24:51 +00:00
Subrahmanyaman
649c660d2b Test to validate a range of certificate validity times. am: e1560216fe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2583372

Change-Id: I8e17f8abbf6b9a031a899e34828a537c71fa6e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 16:14:49 +00:00
Subrahmanyaman
e1560216fe Test to validate a range of certificate validity times.
Bug: 280624515
Test: run VtsAidlKeyMintTarget
Change-Id: Id315c28e2ea114c5c39e235d3ee6be2a0d8bfa71
2024-02-12 15:25:53 +00:00
Devin Moore
9fcb65ddfc Merge "Remove HIDL media.c2 from the 202404 FCM" into main am: e2955b27df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2955347

Change-Id: I0aa722af82d254408f7d44675d28e01f1a9df132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 20:40:17 +00:00
Devin Moore
e2955b27df Merge "Remove HIDL media.c2 from the 202404 FCM" into main 2024-02-09 19:55:42 +00:00
Devin Moore
9fdb6fe412 Merge changes If8f281ec,Id711ba79 into main am: 275fc31337
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2954004

Change-Id: Ifd383dedde3066771e6ef1306a6ef1b3a72c71f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 17:11:05 +00:00
Devin Moore
275fc31337 Merge changes If8f281ec,Id711ba79 into main
* changes:
  bump.py remove Level.h dependency
  Update bump.py for Trunk Stable
2024-02-09 16:23:44 +00:00
Devin Moore
f094d4e363 Remove HIDL media.c2 from the 202404 FCM
HIDL is no longer supported in devices targeting 202404 vendor
interface.

This removes the tmp FCM fragment that was being used to declare the
media.c2 HIDL dependency.

Test: m && launch_cvd
Bug: 218588089
Change-Id: I40973f5cdc9f4c9ca891929c8e8f865119322c17
2024-02-09 00:29:25 +00:00
Devin Moore
0425916b68 bump.py remove Level.h dependency
We want to run bump.py during finalization. We don't want to have to
update Level.h and the VTS tests that early.
So this CL removes the dependency on Level.h and requires the
current/next letters of the API levels for the kernerl configs to be
passed as arguments.

Test: bump.py 202404 202505 v w
Bug: 279809333
Change-Id: If8f281eccf62d380949a5ea9f5d0d3bb2d7f19ab
2024-02-09 00:27:32 +00:00
Devin Moore
4be20f792a Update bump.py for Trunk Stable
The next year's compatbility matrix is added to a conditional statement
so it's only available on in-development release configurations.

The curent year's compatibility matrix is moved from the conditional
statement to always be added to all release configs.

The next year's compatibility matrix level is set to the next year's
level after copying the current matrix file.

Test: ./bump.py
Bug: 279809333

Change-Id: Id711ba79110c8775f715eddf37a9bf51b073ec91
2024-02-09 00:27:29 +00:00
Yu Shan
e06ecd2c2a [automerger skipped] Merge "Create EmuMetadataGenerator to check meta.json." into main am: 1652bf307c -s ours
am skip reason: Merged-In Ib3bc7b68a1312152617fdab4598ed389447c20cd with SHA-1 9540e47340 is already in history

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

Change-Id: I9b98a1241bcdd4ba5feac3c017b3012e48775a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 23:50:37 +00:00
Yu Shan
707ce8c5f0 [automerger skipped] Create EmuMetadataGenerator to check meta.json. am: e6fd48d078 -s ours
am skip reason: Merged-In Ib3bc7b68a1312152617fdab4598ed389447c20cd with SHA-1 9540e47340 is already in history

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

Change-Id: I54895c50595955db20c664d214995b80ecde3660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 23:50:31 +00:00
Yu Shan
1652bf307c Merge "Create EmuMetadataGenerator to check meta.json." into main 2024-02-07 23:10:54 +00:00
Yu Shan
e6fd48d078 Create EmuMetadataGenerator to check meta.json.
Create EmuMetadataGenerator to convert AIDL generated java files
to meta.json that can be used by emulator to populate the available
vhal props list.

Added build rules to generate the Java files from AIDL files and
check whether the meta.json file needs to be updated.

Test: make sdk_car_x86_64-trunk_staging-userdebug target
Bug: 318747444
Change-Id: Ib3bc7b68a1312152617fdab4598ed389447c20cd
Merged-In: Ib3bc7b68a1312152617fdab4598ed389447c20cd
2024-02-07 22:06:58 +00:00
Jeffrey Vander Stoep
b99a805e68 Merge "Replace use of deprecated logging functions" into main am: 919723a5bd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2952816

Change-Id: Ia1bba99986af4c2f708f685a61bdfa9a723b36b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 18:56:08 +00:00
Yu Shan
0b67a32f4e Merge "Create EmuMetadataGenerator to check meta.json." into aosp-main-future 2024-02-07 18:46:22 +00:00
Jeffrey Vander Stoep
919723a5bd Merge "Replace use of deprecated logging functions" into main 2024-02-07 17:57:53 +00:00
Jeff Vander Stoep
116a4d893c Replace use of deprecated logging functions
This is needed to upgrade the android_logger crate from 0.12.0
to 0.13.3.

with_max_level provides the same functionality as with_min_level.
The renaming is admittedly confusing, but the new name is accurate
and it makes sense that they deprecated and then removed the
previously poorly named with_min_level.

See crate documentation [1] and code [2].

[1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level
[2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227

Bug: 322718401
Test: build and run CF with the change.
Test: m aosp_cf_x86_64_phone
Change-Id: Ie410d871ccc2a083eec5bcb7e805f52b985b9385
2024-02-07 12:55:53 +01:00
Yahav Nussbaum
a04bf8b776 Merge "Test that the Bluetooth Finder property is set." into main am: e2f62e73f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2940230

Change-Id: I19644fcf6628ee538c8a5a234f03cd2eacb61a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 07:21:49 +00:00
Yahav Nussbaum
e2f62e73f4 Merge "Test that the Bluetooth Finder property is set." into main 2024-02-07 06:45:05 +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
Treehugger Robot
27e97308c4 Merge "[DON'T BLOCK] Test ownership migration rules" into main 2024-02-07 00:55:34 +00:00
Steven Moreland
081ba6dc0e Merge "AIDL: disable Rust explicitly" into aosp-main-future 2024-02-06 20:03:20 +00:00
Shunkai Yao
35f4bb6089 Merge "Add backward compatibility in effect hal default implementation" into main am: 3ed9b6bbce
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2951489

Change-Id: If5d00b8810e95e0a870fe455951572d687da33cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 18:58:18 +00:00
Shunkai Yao
3ed9b6bbce Merge "Add backward compatibility in effect hal default implementation" into main 2024-02-06 18:23:57 +00:00
Steven Moreland
2a59b89a84 AIDL: disable Rust explicitly
Now that it's enabled by default, because this
doesn't compile in Rust.

Bug: 321267339
Test: m
Change-Id: I01e0af965827944ba2b4b168a6e8d6c4cf81cfff
Merged-In: I01e0af965827944ba2b4b168a6e8d6c4cf81cfff
(cherry picked from commit 62105fb264)
2024-02-06 17:36:03 +00:00
Treehugger Robot
ba0e65c731 [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours am: 85e1f5e409 -s ours am: 1d95f15155 -s ours am: f30ab93e89 -s ours
am skip reason: contains skip directive

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

Change-Id: I66afb0dd0df55fe10edf473b1562727ea4256ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:45:50 +00:00
Kevin Karl
6ce73b092d [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours am: 8824d06406 -s ours am: 145c1fbd21 -s ours am: f61348cffb -s ours
am skip reason: contains skip directive

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

Change-Id: I069b1f796c97c0be76c5a858a55e7ca9e0e74cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:45:46 +00:00
Treehugger Robot
f30ab93e89 [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours am: 85e1f5e409 -s ours am: 1d95f15155 -s ours
am skip reason: contains skip directive

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

Change-Id: If601756ff9631c6a3afad0bc2a5056ffa244ba0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:02:48 +00:00
Kevin Karl
f61348cffb [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours am: 8824d06406 -s ours am: 145c1fbd21 -s ours
am skip reason: contains skip directive

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

Change-Id: I5c3b64d5f640a52ab7b9d133bbf3b818c31e7181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 07:02:43 +00:00
Jooyung Han
6b6d0ef23c Merge "Revert "Install bluetooth audio VINTF fragment in apex"" into main am: c5c0b5eb6a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2951227

Change-Id: Ia075e0a1eecf75781f243947a53536eb2a688e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 06:40:20 +00:00
Treehugger Robot
1d95f15155 [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours am: 85e1f5e409 -s ours
am skip reason: contains skip directive

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

Change-Id: I1d971445353976b1b49757b89a0067646c67b9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 06:18:15 +00:00
Kevin Karl
145c1fbd21 [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours am: 8824d06406 -s ours
am skip reason: contains skip directive

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

Change-Id: I04a9a6a56dd02243d86f58ee830a94c47493f382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 06:18:08 +00:00
Jooyung Han
c5c0b5eb6a Merge "Revert "Install bluetooth audio VINTF fragment in apex"" into main 2024-02-06 05:54:53 +00:00
Treehugger Robot
85e1f5e409 [automerger skipped] Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev am: 1f3bee1191 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie1a578863136c0f34c5dc00e92b7b9604f000971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 05:54:43 +00:00
Kevin Karl
8824d06406 [automerger skipped] [DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest am: 29a9a9ccfd -s ours
am skip reason: contains skip directive

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

Change-Id: Ib6d24f096a57f36adad35f7b6559354f3860769e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 05:54:38 +00:00
Treehugger Robot
1f3bee1191 Merge "[DO NOT MERGE] vts: Fix for setProp in VtsHalAutomotiveVehicleV2_0TargetTest" into android12L-tests-dev 2024-02-06 05:25:19 +00:00
Ke-Yu Lu
e9f8c8c4f5 Revert "Install bluetooth audio VINTF fragment in apex"
Revert submission 2949647-bt-audio-vintf

Reason for revert: b/323989115

Reverted changes: /q/submissionid:2949647-bt-audio-vintf

Change-Id: Ie335aa9a0ad2bb847cabe6f85ef37352e9065e3a
2024-02-06 04:04:01 +00:00
Steven Moreland
f9058afe85 Merge "wifi: no rust by default" into aosp-main-future 2024-02-06 01:28:19 +00:00
Jooyung Han
e5596af7e1 Merge "Install bluetooth audio VINTF fragment in apex" into main am: 0cacd8c7f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2949685

Change-Id: I043fbc9d39e21537b05e66d31d962addaaf8eb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 01:20:20 +00:00
Oriol Prieto Gascó
6c4b234e17 Merge "Set the container field of aconfig flags" into main am: 7c186a5793
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2949210

Change-Id: I34354d787afce6593a976d06cdffc57d0c716196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 01:18:11 +00:00
Jooyung Han
0cacd8c7f5 Merge "Install bluetooth audio VINTF fragment in apex" into main 2024-02-06 00:54:22 +00:00