Commit Graph

1174 Commits

Author SHA1 Message Date
Jooyung Han
860656506a Merge "Put authsecret example in VAPEX" into udc-dev-plus-aosp 2023-08-22 07:58:32 +00:00
Jooyung Han
ada622499b Mark uwb HAL as updatable-via-apex
The AOSP implementation of UWB HAL will be packaged in APEX.

Bug: 296487624
Test: m
Change-Id: I89004f6064fdd3ffae13e64b051208e136a03ac1
2023-08-21 06:07:04 +00:00
Jooyung Han
5faa489f93 Put authsecret example in VAPEX
authsecret example instance is put in APEX.

Bug: 296522705
Test: authsecret HAL starts from APEX in cuttlefish/goldfish
Change-Id: I226fd57fb1ec5c8da98c07292431df055e6078d7
2023-08-18 09:08:26 +00:00
Jooyung Han
670dcc0af3 Mark keymint HAL and its friends as updatable-via-apex am: 49e6433617 am: 08b0be5b4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2704374

Change-Id: I1444f400cb8912c9e053d97f76c1838460cb993c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 00:37:54 +00:00
Jooyung Han
49e6433617 Mark keymint HAL and its friends as updatable-via-apex
Cuttlefish implementation for these HALs are moved into an APEX along
with VINTF fragments. Hence we need to mark them so in FCM.

Bug: 197988234
Test: aosp_cf_x64_64_phone boots
  keymint service starts from apex
Change-Id: I669ef4e215abc203f51bb21b7251aff601531ac7
2023-08-11 16:34:14 +09:00
Yifan Hong
2cfbbf09de matrices: Delete gnss.*.
These aren't top-level interfaces.

Bug: 255383566
Test: TH
Change-Id: I6a9c84b735bd2e233c2976211aa1ec79cd7b609c
(cherry picked from commit 28630885a035ef61bc06240801858689e73648a9)
2023-08-09 15:41:12 -07:00
Yifan Hong
fa24ef60cb Merge changes from topic "fcm_exclude_aidl_version" into main am: 76d87305d5 am: 74e0c01e15
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688568

Change-Id: Icc68b709220dff71e7ecfcf37c5ccb0bf6622ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 21:35:38 +00:00
Yifan Hong
19d015a45e fcm_exclude: mark bluetooth.audio@1 as deprecated.
It never shows up in any matrices. Only bluetooth.audio@2
and beyond are accepted.

Test: TH
Bug: 255383566
Change-Id: I110b73b2ed610d86aa351216fe46d9f803f8c3cf
2023-08-08 13:32:19 -07:00
Yifan Hong
a3975a563f matrices: Add gnss.* to fcm_exclude.
They aren't top level interfaces.

Test: TH
Bug: 255383566
Change-Id: I8265f531880d1dcff1bf7edfd035a25f9e2a4d70
2023-08-08 13:32:12 -07:00
Yifan Hong
68ed69dd7c fcm_exclude: Aidl HALs contains versions.
ShouldCheckMissingAidlHalsInFcm now accepts arguments of
the format android.hardware.foo@1.

Test: TH
Bug: 255383566
Change-Id: I891f749190a8db8725ec1e05b190e73ab4468254
2023-08-08 13:32:11 -07:00
Yifan Hong
5902a1fa71 matrices: automotive.audiocontrol in 7.xml has max version am: 966a4f13a5 am: 980a0781a7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688072

Change-Id: Ie9032fec537abe6040c502c4329db8c45607710b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 02:43:37 +00:00
Yifan Hong
01a3afed45 Merge "fcm_exclude: split HIDL and AIDL predicate." into main am: 23847d4411 am: a2f7b02a8c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688566

Change-Id: If04f6ddb0dd26467344c569918996e3fe13e6444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 00:53:47 +00:00
Terry Guan
b324444c8a Update version for audiocontrol
Bug: 255369346
Bug: 255383566
Test: atest vts_treble_vintf_vendor_test
Change-Id: I17000be75963e511d2a56583be0f619a3dee66f1
Merged-In: I17000be75963e511d2a56583be0f619a3dee66f1
Merged-In: Ic42e51b616782a2763eb80e1cad5ca776cc079d4
2023-08-04 16:50:58 -07:00
Yifan Hong
966a4f13a5 matrices: automotive.audiocontrol in 7.xml has max version
Updates version from 1 to 1-2 to reflect the fact
that version 2 is released in Android 13.

Test: TH
Bug: 255383566
Change-Id: I290aefb51fcc54d5e5a02f8c7da5876e86f61cd9
2023-08-04 16:47:29 -07:00
Yifan Hong
23847d4411 Merge "fcm_exclude: split HIDL and AIDL predicate." into main 2023-08-04 23:16:13 +00:00
Devin Moore
aa8b667844 Remove authsecret HIDL entry in compat matrix.
This interface has been converted to AIDL.

Test: TH
Bug: 218588089
Change-Id: I091ff4acb38c42821e99f785404e922d7b71ffa2
Merged-In: I091ff4acb38c42821e99f785404e922d7b71ffa2
2023-08-02 20:02:33 +00:00
Yifan Hong
36c440a4b3 threadnetwork: declare in V matrix.
... instead of specifying in fcm_exclude.cpp.

Test: TH
Bug: 255383566
Change-Id: I5aa1f654ef8cdfd37737f045854a87d33c36b70b
2023-08-01 16:34:47 -07:00
Yifan Hong
32f40c34ef fcm_exclude: split HIDL and AIDL predicate.
AIDL is going to have a new format in fcm_exclude:
android.hardware.foo@1. This cannot be excluded
properly when mixing with HIDL, so split.

Test: TH
Bug: 255383566
Change-Id: I3df9517f12b62f5112df307528d5c3deab12cfa0
2023-08-01 16:05:40 -07:00
Ryan Prichard
ce87f3a63d Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea am: 073c14a320
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342

Change-Id: I6af09129d24876e8582ab2121512dd16b1ec3492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 22:12:55 +00:00
Ryan Prichard
e5896f0fea Merge "Include <functional> for std::function and std::placeholders" into main 2023-07-25 20:17:01 +00:00
Ryan Prichard
c8fc80c47b Include <functional> for std::function and std::placeholders
Bug: b/175635923
Test: treehugger
Change-Id: I3dabb8c44334713be9e461dd81f437c3da1ea936
2023-07-21 16:18:11 -07:00
Treehugger Robot
3da1fa5fa1 Merge "FCM: add c2 software, IConfigurable instances" into main am: 75275ce51e am: 33fcf56f2c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666395

Change-Id: Ia81a3e1b894fbb55c01387a54ed65de3a0a25758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 22:14:40 +00:00
Treehugger Robot
75275ce51e Merge "FCM: add c2 software, IConfigurable instances" into main 2023-07-21 20:46:08 +00:00
Eric Biggers
2a5366d850 Merge changes from topic "weaver-vts-fix" into main
* changes:
  Don't overwrite in-use Weaver slots during VTS
  Simplify Weaver VTS test
  Remove redundant HIDL Weaver VTS test
  Move VtsHalWeaverTargetTest to common directory
  Make VtsHalWeaverTargetTest test both HIDL and AIDL services
  Clarify the Weaver documentation
  Update weaver AIDL default to use V2
  Add WeaverReadStatus to WeaverReadResponse
2023-07-20 16:53:13 +00:00
Steven Moreland
72f588429a FCM: add c2 software, IConfigurable instances
These instances were previously added manually
on a device-by-device basis. Adding them explicitly
here now.

Bug: 290408770
Test: N/A
Change-Id: Ibc1470aae02d2b1172ea62efeb5af31224b80c45
2023-07-19 21:22:38 +00:00
Treehugger Robot
b5d9f4483a Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: I1aeb2f2d0a98f872c8f0b746c72495c3ee591ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 20:40:09 +00:00
Treehugger Robot
1da295ca82 Merge "Require mapper4" into main 2023-07-19 18:20:57 +00:00
John Reck
34412e26a6 Require mapper4
Bug: 280901110
Test: make

Change-Id: I49fa786957716d896b5476eac32b4c6d9077fe80
2023-07-19 11:29:56 -04:00
Devin Moore
316cf58d49 Update weaver AIDL default to use V2
Test: VtsHalWeaverTargetTest
Bug: 259556049
Change-Id: Id6aa9316a20541bf2c9a7cc53345a5010a188d00
(cherry picked from commit daf12d9440)
Merged-In: Id6aa9316a20541bf2c9a7cc53345a5010a188d00
2023-07-19 04:08:53 +00:00
Steven Moreland
031aeee88c Merge "compat matrix: add ISap slot2" into main 2023-07-17 23:42:51 +00:00
Treehugger Robot
609c5af5df Merge "compatibility_matrices: Only allow core HALs for system FCMs." into main am: 00e273d023 am: f06a9bc431
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2652625

Change-Id: Id4a89277236909e76b8af9bebdb8948d21766775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:02:33 +00:00
Yifan Hong
2171ca5bfc Merge "compatibility_matrices: add vintf_compatibility_matrix.core_hals." into main am: 7066d3369a am: c06ac12354 am: a31a6d0c74
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2652627

Change-Id: I2a10c3727080b77f92eff9093f24d0b7e83d797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 21:59:00 +00:00
Steven Moreland
477673de32 compat matrix: add ISap slot2
The framework supports this, but devices copied its support
into each of their compat matrices instead of adding it once
here.

Bug: 290408770
Test: build
Change-Id: I2de4f1365a6981a0a2ef7165c916fba91a340799
Merged-In: I2de4f1365a6981a0a2ef7165c916fba91a340799
2023-07-12 23:16:15 +00:00
Steven Moreland
719f646530 compat matrix: add ISap slot2
The framework supports this, but devices copied its support
into each of their compat matrices instead of adding it once
here.

Bug: 290408770
Test: build
Change-Id: I2de4f1365a6981a0a2ef7165c916fba91a340799
2023-07-12 23:15:48 +00:00
Yifan Hong
42d17688d4 compatibility_matrices: Only allow core HALs for system FCMs.
For system FCMs (except device-specific
system FCM), only allow android.* and
mapper HALs.

Test: TH
Bug: 290408770
Change-Id: I4c3908911440a3c154200a6c7b338f92bd724a68
2023-07-10 17:48:37 -07:00
Yifan Hong
9fb9ff77b1 compatibility_matrices: add vintf_compatibility_matrix.core_hals.
Add core_hals attribute to the vintf_compatibility_matrix
rule. Its value is passed to assemble_vintf directly.

Test: TH
Bug: 290408770
Change-Id: Ie5e3363f0039f032033cbc2889b1bbbb0a5a56a7
2023-07-10 17:48:36 -07:00
Yifan Hong
3716063e4e Merge "compatibility_matrices: Add script to create the next." into main am: 9d0b975f6c am: 32ff4ec295 am: b574f6e46e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572973

Change-Id: I0d210d06a832b999e3747342b32f3696c8db534e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 23:05:32 +00:00
Yifan Hong
ace13dee65 compatibility_matrices: Add script to create the next.
Add a `bump.py` script that does the following:
- Create a commit in kernel/configs with the new versions
- Copy the latest compatibility matrix to a new compatibility matrix
- Fix Android.bp and Android.mk

Prerequisite:
- libvintf/Level.h must contain the mapping for the next release.

Test: bump.py 9 10
Bug: 279809082

Change-Id: I4520a128b39f66a03f22d24218348f5fff92e9cd
2023-07-10 12:37:27 -07:00
Treehugger Robot
6fd87a9b7e Merge "Allow face HAL to be updated via apex in U" into main am: 099240ae66 am: 7e69098f40 am: 80cba87acb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2649859

Change-Id: I44b2ecc3703c984b982735e5df1582e6a9fcd14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:22:55 +00:00
Treehugger Robot
099240ae66 Merge "Allow face HAL to be updated via apex in U" into main 2023-07-06 22:06:52 +00:00
Nataniel Borges
a777c5437e Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I022940e8aff29c92bb6fe9ad13e1a9a5d3aa11ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 13:59:19 +00:00
Nataniel Borges
d74d81bf6e Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW"
* changes:
  Revert "Only allow cuttlefish to use FCM 9 HALs"
  Revert "Allow fingerprint HAL to be updated via apex in U"
2023-07-06 11:41:24 +00:00
Nataniel Borges
7202c60c3a Revert "Only allow cuttlefish to use FCM 9 HALs"
Revert submission 2649121-cm_vintf_workaround

Reason for revert: b/290154726

Reverted changes: /q/submissionid:2649121-cm_vintf_workaround

Change-Id: Ied04c3892a4a00ef75f92e1f89ba38cada2f8293
2023-07-06 10:08:24 +00:00
Nataniel Borges
e42c161bcd Revert "Allow fingerprint HAL to be updated via apex in U"
Revert submission 2649121-cm_vintf_workaround

Reason for revert: b/290154726

Reverted changes: /q/submissionid:2649121-cm_vintf_workaround

Change-Id: I39d65f3a675a3616401411076a4eade403917707
2023-07-06 10:08:24 +00:00
Jooyung Han
6942901f5c Allow face HAL to be updated via apex in U
Bug: 290142180
Test: m check-vintf-all (with -next- pixel targets)
Merged-In: Ia3b15f669219a0941498b90a76b42d5f2f5ac80b
Change-Id: Ia3b15f669219a0941498b90a76b42d5f2f5ac80b
(cherry picked from commit dcd2ae7c29)
2023-07-06 17:13:41 +09:00
Treehugger Robot
97c9dc808a Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab87 am: 944b55764d am: f7776a0d21
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646273

Change-Id: Id8c71385f153009ed65ef46d35afc96f0344b8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 23:43:41 +00:00
Devin Moore
a7b0ffb678 Only allow cuttlefish to use FCM 9 HALs am: 92aebeae51 am: e3395a7486 am: eece383041
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2647305

Change-Id: I12ac6019ba105dce8a97da21eab7f068cd883c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 23:43:35 +00:00
Devin Moore
e3395a7486 Only allow cuttlefish to use FCM 9 HALs am: 92aebeae51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2647305

Change-Id: Ibc08d8fb4216b6750afb04bd237c627a828ce98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:15:24 +00:00
Treehugger Robot
8c45f4ab87 Merge changes from topic "cm_vintf_workaround"
* changes:
  Allow fingerprint HAL to be updated via apex in U
  Only allow cuttlefish to use FCM 9 HALs
2023-07-05 21:33:49 +00:00
Devin Moore
4b5d155a40 Allow fingerprint HAL to be updated via apex in U
Test: m
Bug: none
Change-Id: I7449380005bc3e0da8adcd45319ed239c004dfcc
2023-07-05 18:31:34 +00:00