Commit graph

1395 commits

Author SHA1 Message Date
Xin Li
64e598ce2b Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I53a278f1317f5307441103dc42dc5be6f20d7075
Change-Id: I3a53ebf7339cdb886d3c1b733b8eee1847f8832a
2024-05-24 08:28:04 -07:00
A. Cody Schuffelen
f693f3bc5c Allow vendor ISharedSecret HALs by any name
This works together with the keystore2 implementation which already
scans the device for implementations by any name.

Relevant code that searches for "shared secret participants":

https://cs.android.com/android/platform/superproject/main/+/main:system/security/keystore2/src/shared_secret_negotiation.rs;l=142;drc=f20c0ddd095013f983d0f73aee0285331bfae4e3

Bug: 332376454
Test: Run cuttlefish
Change-Id: I5eef81e5f55aaa327cabb5c648e085229b8ce6db
2024-04-10 12:59:00 -07:00
Devin Moore
51c2631a95 Merge "Add 202404 FCM to next release config" into main 2024-03-07 23:57:36 +00:00
Devin Moore
e3a1202176 Add 202404 FCM to next release config
202404 FCM is now frozen and supported internally. Add the 202404 FCM to
all builds to allow freezing 202404 HAL interfaces and serving the new
versions in the next release config.
Create 202504 FCM for people to start working on the 202504 interface
changes. This new file is based on the internal 202504 file.

Merged-In: Ie6d38d27a287e258c30516e0030ad8c931d06432
Test: m
Bug: 328236210
Change-Id: Iaef8117a18441951070816344aecd24fdd4969f4
2024-03-06 21:30:12 +00:00
Devin Moore
a8efdb127e Vendor API level 202404 is now frozen
Ignore-AOSP-First: VINTF 202404 Finalization
Bug: 279809333
Test: build
Change-Id: Ie6d38d27a287e258c30516e0030ad8c931d06432
2024-02-20 21:05:23 +00:00
Devin Moore
932705cb37 Merge "Remove HIDL media.c2 from the 202404 FCM" into main am: e2955b27df am: 9fcb65ddfc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2955347

Change-Id: I051859139e4144a81d7dd705a30de192adecbd78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 21:19:42 +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
e74ca1b9f6 Merge changes If8f281ec,Id711ba79 into main am: 275fc31337 am: 9fdb6fe412
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2954004

Change-Id: I8ad028f340cb690a71d7b01299cdc87975329427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 17:51:20 +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
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
Devin Moore
f5bedd5620 Merge "Revert^2 "Remove Q matrices"" into main am: 7f3b4b2a38 am: 1fc8301983
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2934130

Change-Id: I387d397cb16240b1273a0b2101a8fad10b0f3741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 22:26:01 +00:00
Devin Moore
1fc8301983 Merge "Revert^2 "Remove Q matrices"" into main am: 7f3b4b2a38
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2934130

Change-Id: I2ffc32322b012a4dd2214c45ab3475bf30cd0d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 21:42:35 +00:00
Devin Moore
7ad5797272 Revert^2 "Remove Q matrices"
Re-landing now that the downstream devices are targeting later FCMs.

Test: m
Bug: 279809679

5f679f3deb

Change-Id: I29de76f787cadb801b60724526fa2851ba599dcc
2024-01-31 23:54:02 +00:00
Xin Li
763c473c3d Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I976f80006aeb88bde2ae34ca4f9be72cea727d9e
Change-Id: Id94b25af52bd2e2847b6858697ab21cc6ce27aa3
2024-01-30 10:36:50 -08:00
Treehugger Robot
50269c0ab2 Merge "Remove HIDL media C2 from 202404 compatibility matrix" into main am: 10e58a2c70 am: 6d5334a07d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2929440

Change-Id: Ic0a391b96ecd8e4d3e01d7b76b4d2d6b6e63dbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 18:35:22 +00:00
Devin Moore
d4d89b5f24 Remove HIDL media C2 from 202404 compatibility matrix
Put it in its own FCM so it's easier to manage while HIDL C2 is being
depregated with flagging.

This interface will not be allowed in the 202404 vendor interface.

Test: launch_cvd
Bug: 218588089
Change-Id: I24e14db4edd161a574a4404c8b7271c91dc1243a
2024-01-26 22:14:05 +00:00
Treehugger Robot
7438e4bdb4 Merge "compatibility matrices: drop optional=true. (202404)" into main 2024-01-17 07:47:26 +00:00
Treehugger Robot
59513708a9 Merge "compatibility matrices: drop optional=true. (4~8)" into main am: 1014102ee6 am: ae3e2648d3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2909099

Change-Id: I007171cc585da54592944d803e538359dde1df88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-16 21:45:38 +00:00
Yifan Hong
f74a4cae39 compatibility matrices: drop optional=true. (202404)
This is the default now.

Test: TH
Bug: 247575800
Change-Id: I0d7156f4e526b276c47ac66a5125bf2a219b3ed8
Merged-In: I0d7156f4e526b276c47ac66a5125bf2a219b3ed8
2024-01-16 12:26:06 -08:00
Yifan Hong
3be69560e6 compatibility matrices: drop optional=true. (202404)
This is the default now.

Test: TH
Bug: 247575800
Change-Id: I0d7156f4e526b276c47ac66a5125bf2a219b3ed8
2024-01-16 12:23:01 -08:00
Treehugger Robot
1014102ee6 Merge "compatibility matrices: drop optional=true. (4~8)" into main 2024-01-16 20:03:16 +00:00
Devin Moore
a47b07744e [conflict] Merge "Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml" into main am: 89c395a850 am: 9862527094 am: e346798006
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907790

Needed to copy the existing compatibility_matrix.9.xml from this target branch to the new compatibility_matrix.202404.xml file.

Change-Id: I71ef6ce9b6039ed757caa5ddc257970732a454e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-16 17:22:00 +00:00
Yifan Hong
b0d52ce954 compatibility matrices: drop optional=true. (4~8)
This is the default now.

Test: TH
Bug: 247575800
Change-Id: Ibaf315f34285c42341cd4c04adc7c44b6f34ab7f
2024-01-12 16:11:40 -08:00
Devin Moore
0e8347e131 Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml
The target compatiblility matrix level is now 202404 instead of 9.

Test: m
Bug: 314845349
Change-Id: I6661486039c0ec3ba4093f1afe11b78a690a96d8
2024-01-12 17:45:58 +00:00
Devin Moore
a7fd6c6dc7 Merge "Remove HIDL audio HAL from compat matrix 9" into main am: da9b02c52d am: 239a4dedf8 am: ea713fabc4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2895324

Change-Id: I758748c8096b8e020901b415a978c308dffbe5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 01:29:22 +00:00
Devin Moore
c4b896e586 Remove HIDL audio HAL from compat matrix 9
It's replaced by the AIDL audio HAL.

Test: m
Bug: 264712385
Change-Id: I680a7bb58e636c0ed86dc2a72a27322ee163685c
2024-01-03 22:48:16 +00:00
David Drysdale
0f1a490d0c Merge "Add ISecretkeeper/default" into main am: e1ac7c65a2 am: 0e0b3459a4 am: fde16f7e0c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2856630

Change-Id: I066129d16f22332467b31d8e791762dee9faef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 12:09:38 +00:00
David Drysdale
e1ac7c65a2 Merge "Add ISecretkeeper/default" into main 2023-12-20 10:24:11 +00:00
Hang Shi
1cc6b1c9c2 Merge "Bluetooth LMP Events: Interface for LMP events" into main am: 549fc869ef am: 8ae7769df3 am: e7599d6bb5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587847

Change-Id: I3084397dbc9ba829abb23e5c6920bec05e0d99a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 04:24:42 +00:00
Hang Shi
549fc869ef Merge "Bluetooth LMP Events: Interface for LMP events" into main 2023-12-19 02:34:53 +00:00
David Drysdale
56402008b2 Add ISecretkeeper/default
On Cuttlefish, the implementation of the ISecretkeeper HAL runs
in-process in the HAL service, and so is deliberately marked as being
the /nonsecure instance to make that clear.

A real device that's running Secretkeeper inside a secure environment
should report that instance as being the /default instance.

So allow either in the compatibility matrix.

Bug: 306364873
Test: build, VtsAidlAuthGraphRoleTest, VtsSecretkeeperTargetTest
Change-Id: Ifb58d8bb9318707b714a345adc1b1b4198054f81
2023-12-18 07:01:38 +00:00
Joshua Mccloskey
f6bc1288c5 Merge "Freezing face api" into main 2023-12-12 16:18:36 +00:00
David Anderson
6e367dd86f Merge "Add android.hardware.health AIDL HAL V3." into main am: 9315c9f499 am: 346f8587c6 am: eb6c88c9d2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2836453

Change-Id: I4a3578173a7d6a59d73f4acd6b84088358c1e0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 05:43:39 +00:00
David Anderson
9315c9f499 Merge "Add android.hardware.health AIDL HAL V3." into main 2023-12-12 04:00:47 +00:00
Chienyuan Huang
f30401d73f Add HAL interface for Channel Sounding am: d74aedc9df am: 75a7c5f6f3 am: 0cff1737bc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2830290

Change-Id: I23b6d28972b97f394947a29dd74770b57ac51936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:13:45 +00:00
Joshua McCloskey
93ee24e67f Freezing face api
Test: N/A
Change-Id: I0c0ac52fbdc96ae2a416922ff4c994f0f2909802
2023-12-11 22:17:40 +00:00
Chienyuan Huang
75a7c5f6f3 Add HAL interface for Channel Sounding am: d74aedc9df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2830290

Change-Id: I2b7f6d09389032e40bbb5d78da73891181ed159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:33:38 +00:00
David Anderson
85b3b0321a Add android.hardware.health AIDL HAL V3.
Bug: 309792384
Test: m
Change-Id: I5e9183b840f523f4d5b81dec813d35983882f71d
2023-12-11 11:01:52 -08:00
Chienyuan Huang
64930a6379 Merge changes from topic "Bluetooth_Ranging" into main
* changes:
  Add default implementation for Channel Sounding
  Add HAL interface for Channel Sounding
2023-12-11 03:43:57 +00:00
TeYuan Wang
3d8c680f0a thermal: support more temperature and cooling device type
Bug: 312540064
Test: build
Change-Id: I6e11a181a09640e3f597344dbcbb7571b7e49453
2023-12-08 17:48:33 +00:00
Chienyuan Huang
d74aedc9df Add HAL interface for Channel Sounding
Bug: 310941161
Test: m android.hardware.bluetooth.ranging-update-api
Change-Id: I4b0d103b851c546c9cb7277ae0c828d740367b63
2023-12-07 22:03:25 +00:00
Vincent Wang
774a9c0f44 Update biometrics HAL interface version(2/2)
In order to pass fold/unfold information to HAL during face auth,
add a new filed into OperationContext.aidl and update biometric
HAL interface version

Test: Build pass
Bug: 305284901
Change-Id: I886440a6332ba8c2555b29322c05f27edb7a5d44
2023-12-07 03:59:12 +00:00
Shuzhen Wang
df89cb9c21 Camera: Add new function to query for SessionConfiguration
- The new isStreamCombinationSupported takes into consideration
  the session parameters.
- In order to create CaptureRequest in ICameraDevice, a
  createDefaultRequestSettings function is needed.

Test: Run camera VTS with session_configuration_with_parameters_query flag enabled
Bug: 309627704
Change-Id: Ib344e6991484b834aa8483ed8637ce5cd02ede87
2023-12-05 03:48:51 +00:00
William McVicker
1dcf3b57ba Merge "Update Android V compatibility matrix" into main am: 1ba87c3848 am: 6113fc26ac am: 2899fbb36c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2854992

Change-Id: I38018d1e58e972f3f4b4d82f06bbae8c9e27223b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 19:58:31 +00:00
William McVicker
6113fc26ac Merge "Update Android V compatibility matrix" into main am: 1ba87c3848
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2854992

Change-Id: Id56afc33e284436dc03dccc4d055652d8ab8743b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 18:56:24 +00:00
William McVicker
1ba87c3848 Merge "Update Android V compatibility matrix" into main 2023-12-04 17:48:03 +00:00
Umesh Vats
5e480a73d0 Bluetooth LMP Events: Interface for LMP events
Interface for monitoring bluetooth LMP events for a specific device.

Bug: 281503650
Change-Id: I1de25184a6e67c9f13c33c0d4283dc51855d5dc4
2023-12-01 13:43:21 -08:00