Commit graph

1205 commits

Author SHA1 Message Date
Yifan Hong
a0dff6551e matrices: automotive.audiocontrol in 7.xml has max version am: 966a4f13a5 am: 980a0781a7 am: 5902a1fa71 am: 703091afe7 am: 4bb205239d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688072

Change-Id: I5427f9069a5157a4aa7f0d20b539d7994ed6e13b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 04:59:46 +00: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
0a928b1718 Merge "fcm_exclude: split HIDL and AIDL predicate." into main am: 23847d4411 am: a2f7b02a8c am: 01a3afed45 am: 8bcce246a2 am: 7725da1b9b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2688566

Change-Id: I619b1a183cdac9b2d754bfd889ab9b82d143ed87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 02:22:43 +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
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
3fd7e5c17d threadnetwork: declare in V matrix. am: 36c440a4b3 am: accfbc2c06 am: d60ca5d34e
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24289189

Change-Id: I221564888cfaa8945a1bdd4a76dea2751c6b18b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 17:52:36 +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
45d6657f8f Merge "Include <functional> for std::function and std::placeholders" into main am: e5896f0fea am: 073c14a320 am: ce87f3a63d am: bc5e1931d8 am: afa3d1a2cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2674342

Change-Id: Iaf5083189f9d9faf5f97b07bafc56d59a2750b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 00:35:13 +00: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
Treehugger Robot
d8b137e8ad Merge "FCM: add c2 software, IConfigurable instances" into main am: 75275ce51e am: 33fcf56f2c am: 3da1fa5fa1 am: 3390e26143 am: 5c6efdebe4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2666395

Change-Id: Iabc11c68bf41ab7f4c9b5421f7ad94b1e2f66504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-22 00:29:38 +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
Treehugger Robot
cc6c59afae Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca am: b5d9f4483a am: b607ed9013 am: abb9754df8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665655

Change-Id: Id000da5e5849300f3adbca1869ac250963ac2ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 22:50:46 +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
Ram Indani
4a97f080ed Merge changes from topic "HWC3-V3" into main
* changes:
  [Composer VTS] Adds VTS for getDisplayConfigurations
  Upgrade Composer interface version
  [Composer-HAL-AIDL] Interface changes with getDisplayConfigurations
2023-07-15 03:51:04 +00:00
Treehugger Robot
5a51b7973a Merge "compatibility_matrices: Only allow core HALs for system FCMs." into main am: 00e273d023 am: f06a9bc431 am: 609c5af5df am: c44a6c1b4d am: 025d18a0c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2652625

Change-Id: I6321f9038d0f9ba7fc3aeca558465587241c3293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 00:33:48 +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
9608b8a7ec Merge "compatibility_matrices: add vintf_compatibility_matrix.core_hals." into main am: 7066d3369a am: c06ac12354 am: a31a6d0c74 am: 2171ca5bfc am: 68781db031 am: de71948c67
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2652627

Change-Id: Ia15df7f37d53136e236c5efa3923037683b9b4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 00:53:45 +00:00
Steven Moreland
c0b1114f0b Merge "compat matrix: add ISap slot2" into udc-dev-plus-aosp am: c4f6ec1887 am: 4416477947 am: 9f92f8eedc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24047365

Change-Id: Id4874da954d5b60a16bcff138dc1d6322df3f178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 00:53:22 +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
ramindani
e50ed5d4e6 Upgrade Composer interface version
Test: device boots, atest libsurfacerflinger_unittest, atest VtsHalGraphicsComposer3_TargetTest
BUG: 284866749
BUG: 287517352
Change-Id: I803a4291c0839857f7e23696da7dac4c15a21e09
2023-07-13 10:55:20 -07: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
7ac167aa98 Merge "compatibility_matrices: Add script to create the next." into main am: 9d0b975f6c am: 32ff4ec295 am: b574f6e46e am: 3716063e4e am: deda0b835a am: e1c61854ff
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572973

Change-Id: Iaec5da82fa5c4817f3ad8b47caa8c9b426118692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 01:10:23 +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
Lei Ju
1f8f5e55ec Merge "Introduce a new callback function to get client's UUID" into main 2023-07-06 22:33:04 +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
c47a00c90b Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW" am: d74d81bf6e am: a10ed15f74 am: 579e7baeb1 am: a777c5437e am: ef4267d45a am: 6cd4c57b3d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648722

Change-Id: I0e6ce8e2a466105dc11d3d7dff07934930b1c735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 16:09:30 +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
Jooyung Han
dcd2ae7c29 Allow face HAL to be updated via apex in U
Bug: 290142180
Test: m check-vintf-all (with -next- pixel targets)
Change-Id: Ia3b15f669219a0941498b90a76b42d5f2f5ac80b
2023-07-06 15:43:00 +09:00
Treehugger Robot
c0fb627097 Merge changes from topic "cm_vintf_workaround" am: 8c45f4ab87 am: 944b55764d am: f7776a0d21 am: 97c9dc808a am: 47a5548908 am: ea7f8de460
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646273

Change-Id: I5b954aedc0ef196a3d17bcfe572cb5bd5b0d8888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:23:03 +00:00