Commit graph

65799 commits

Author SHA1 Message Date
A. Cody Schuffelen
34781e1bbb Fix .rc file for keymint-service.nonsecure am: ddc6a8dbdf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3015573

Change-Id: I63288079b1c7abe1c2b7f8460980ec4a8bad5e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 09:25:11 +00:00
Nikolay Elenkov
03cf716392 Enable Java backend for ISecretKeeper
Bug: 324321147
Test: Manual -- trigger factory reset, confirm ISecretKeeper.deleteAll()
is being called in Trusty logs.

Change-Id: I0f033b53e83ff549f80271ba4a6ebeabac3db922
2024-03-27 06:51:05 +00:00
Shreshta Manu
3187837a7d [automerger skipped] Merge "Disable UWB before starting VtsHalUwbTargetTest" into 24D1-dev am: 7b487494d9 -s ours
am skip reason: Merged-In I4dfff45015232bbd0a4445e42b13db3ff2d9e87c with SHA-1 6bab73f7ea is already in history

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

Change-Id: Ic09537b9b5a6c47b5999392a2262f9abe9815d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 00:51:37 +00:00
Mathieu Mandret
52f6290a12 [automerger skipped] Disable UWB before starting VtsHalUwbTargetTest am: d1e6b6a556 -s ours
am skip reason: Merged-In I4dfff45015232bbd0a4445e42b13db3ff2d9e87c with SHA-1 6bab73f7ea is already in history

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

Change-Id: I26b4999a20500a19d1b26794b89276828aaf8d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 00:51:34 +00:00
Shreshta Manu
7b487494d9 Merge "Disable UWB before starting VtsHalUwbTargetTest" into 24D1-dev 2024-03-27 00:37:58 +00:00
Mikhail Naganov
d975a9e6ec audio: Allow to inherit Binder RT priority in AIDL
This option is on by default for HIDL interfaces, however
in AIDL it needs to be enabled explicitly.

Bug: 331469541
Test: m
Change-Id: I971185a46da4222160fb04b8b77f805ef0396562
2024-03-26 17:22:47 -07:00
A. Cody Schuffelen
ddc6a8dbdf Fix .rc file for keymint-service.nonsecure
This target was using the same `.rc` as the keymint-service target,
though it had a different name.

Bug: 331474817
Test: LOCAL_KEYMINT_PRODUCT_PACKAGE=android.hardware.security.keymint-service.nonsecure m && launch_cvd --noresume --secure_hals=keymint,oemlock
Change-Id: I0f744b75e451f6780d8f6c9bddbd5ea80c579a20
2024-03-26 15:40:37 -07:00
Treehugger Robot
0c9e8112dc Merge "Remove cleanup after bench loop from setAmplitude test" into main 2024-03-26 20:29:25 +00:00
Doug Ferraz
f51a196bae Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - Annotations" into main am: cfa68a1fbb am: ddf020e313
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3012536

Change-Id: If10905b5df19105d52a5aada03c966ff0d98b714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 14:49:50 +00:00
Doug Ferraz
ddf020e313 Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - Annotations" into main am: cfa68a1fbb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3012536

Change-Id: If13ac662e4ef1c803ccec068b91bf412e152b19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 14:32:57 +00:00
Doug Ferraz
cfa68a1fbb Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - Annotations" into main 2024-03-26 14:02:54 +00:00
Lais Andrade
db8ffbb077 Remove cleanup after bench loop from setAmplitude test
Fix error on waiting for long vibration callback that might have been
already cleared by the HAL when vibration finished. Test run crash log:

FORTIFY: pthread_mutex_lock called on a destroyed mutex (0xf5a83bbc)

Keep all test cleanup logic in teardown methods.

Bug: 329899022
Change-Id: If7c13296b870e792063a9ad7b307d57fb5c333aa
Test: atest VibratorHalIntegrationBenchmark
2024-03-26 12:03:10 +00:00
Tang Lee
45d7a9e1b4 ExternalCameraHAL: fix CTS failures with callback for errors
For every request, either requestStreamBuffers fails or
handling of the requested buffer fails, always trigger
the processCaptureResult callback by notifying the request
is ready. This avoids the errors like the service side
receives fewer results than the requests and waits until
timeout.

Bug: 299182874
Test: cts
cts-tradefed run cts \
  --include-filter  "CtsCameraTestCases android.hardware.camera2.cts.RobustnessTest" \
  --include-filter "CtsCameraTestCases android.hardware.camera2.cts.PerformanceTest" \
  --include-filter "CtsCameraTestCases android.hardware.camera2.cts.StillCaptureTest" \
  --include-filter "CtsCameraTestCases android.hardware.camera2.cts.SurfaceViewPreviewTest" \
  --include-filter "CtsCameraTestCases android.hardware.cts.CameraGLTest" \
  --include-filter "CtsCameraTestCases android.hardware.cts.LegacyCameraPerformanceTest" \

Merged-in: I86ba422524e79af6b318b50bd6eebe2cb27fa50a
Change-Id: I86ba422524e79af6b318b50bd6eebe2cb27fa50a
2024-03-25 17:28:06 -07:00
Tang Lee
895f5bbddc ExternalCameraHAL: improve buffer and error handling
After enabling HALL Buffer Management, it requires more careful
error handling and syncing. Process the buffer request error correctly.
Handle the lock and states correctly.

Bug: 299182874
Test: CTS passed, expecially
./cts-tradefed run cts -m CtsCameraTestCases -t android.hardware.camera2.cts.NativeCameraDeviceTest
./cts-tradefed run cts -m CtsCameraTestCases -t android.hardware.camera2.cts.RobustnessTest

Merged-in: I04d8e19a2ee78580e54340378122c724a3de8edb
Change-Id: I04d8e19a2ee78580e54340378122c724a3de8edb
2024-03-25 17:27:59 -07:00
Avichal Rakesh
a52542e856 ExternalCameraHAL: Skip importing buffer from capture request
ExternalCameraHAL supports HAL buffer management which means
cameraservice will not send it an output buffer along with the
capture request, and the HAL has the freedom to request an
output buffer when an output buffer is needed.

As a remnant of migration from HIDL to AIDL, the
ExternalCameraHAL still attempted to import buffers that
the cameraservice has sent with the CaptureRequest. However,
with HAL buffer manager enabled, this buffer is always null and
results in the HAL failing to process the capture request.

This CL removes the logic for importing output buffers when
processing capture requests from the cameraservice, and lets
the HAL call requestStreamBuffers when it needs an output buffer.

Bug: 299182874
Test: VTS Tests now pass
Merged-in: I00654836b7ae91a91a2afa4b149712977e07dcc5
Change-Id: I00654836b7ae91a91a2afa4b149712977e07dcc5
2024-03-25 17:27:47 -07:00
Shrikar Amirisetty
844a04c078 Merge "Updated EV_CHARGE_STATE HAL docs with behavior on reaching user target" into main 2024-03-26 00:27:47 +00:00
Avichal Rakesh
b3b02babbb ExternalCameraHAL: Prevent memory leak when manipulating native_handle
native_handle objects created by makeFromAidl need to be deleted
with native_handle_delete. Not doing so leads to a memory leak
every time makeFromAidl is called.

This CL ensures that native_handle_delete is called on the
return value of makeFromAidl wherever it is used.

Bug: 305638723
Test: n/a. No functional change.
Merged-in: Ia99ba6e3abbdf7dec75383450a60c944b92a9c74
Change-Id: Ia99ba6e3abbdf7dec75383450a60c944b92a9c74
2024-03-25 17:27:32 -07:00
shrikar
69bc05cd89 Updated relevant EV_prop HAL docs with expected behavior in multiport EV
Bug: 316927574
Test: presubmit
Change-Id: I5bbb4d5bd11c2b858852125c50a289f21c12bd23
2024-03-26 00:26:12 +00:00
Treehugger Robot
bb3b5cb58f [automerger skipped] Merge "ExternalCameraHAL: dup fd when creating AIDL NativeHandle" into main am: dc543a304b am: f1b6d2b424 -s ours
am skip reason: Merged-In Ic406634de6f22a290abb414e80a7747927368b68 with SHA-1 31437d0f3c is already in history

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

Change-Id: I215620d042e97bb44941b54115e2b9ef5418caf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:19:26 +00:00
Doug Ferraz
eff7b9102f Bluetooth HCI: Add VTS requirement for HCI 4.2 - Annotations
Bug: 285456310
Test: atest VtsHalBluetoothV1_1TargetTest
Test: atest VtsHalBluetoothV1_0TargetTest
Test: atest VtsHalBluetoothTargetTest
Change-Id: I5a910d2a7d778b2e64a524d0a389b911c080e189
2024-03-25 20:04:19 -04:00
Treehugger Robot
f1b6d2b424 Merge "ExternalCameraHAL: dup fd when creating AIDL NativeHandle" into main am: dc543a304b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3011694

Change-Id: I6e3a394f5eb9b99b64feedf442c5e99bafb41ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-26 00:04:17 +00:00
Treehugger Robot
dc543a304b Merge "ExternalCameraHAL: dup fd when creating AIDL NativeHandle" into main 2024-03-25 23:54:31 +00:00
Doug Ferraz
5c49b6b07a Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - HIDL version" into main am: 7229b6bacc am: 1c7042ebee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3011696

Change-Id: I6a24b7a0ffb8717cfd8cffb89750682505f10693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 22:56:32 +00:00
Doug Ferraz
1c7042ebee Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - HIDL version" into main am: 7229b6bacc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3011696

Change-Id: If0d876bc013d660d2fc7ac1ab81f4e19ca7d68bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 22:39:57 +00:00
Doug Ferraz
7229b6bacc Merge "Bluetooth HCI: Add VTS requirement for HCI 4.2 - HIDL version" into main 2024-03-25 22:24:41 +00:00
Avichal Rakesh
ea30826bf3 ExternalCameraHAL: dup fd when creating AIDL NativeHandle
AIDL's NativeHandle do not have a concept of unowned file
descriptors. If a NativeHandle object is created with an
fd, NativeHandle implicitly assumes ownership of the fd.
When passing fds over binder, ExternalCameraHAL used
makeToAidl which which accidentally transferred ownership
to the AIDL objects. Additionally, NativeHandles close
owned fds on destruction, which led to multiple closure
of fences.

This CL changes the logic to use dupToAidl to ensure that
NativeHandle objects are given ownership of a duped fds
and don't interfere with any of the fds used for internal
bookkeeping.

Bug: 313115623
Test: Verified by partner that ExternalCameraHAL no longer double closes fds.
Merged-In: Ic406634de6f22a290abb414e80a7747927368b68
Change-Id: Ic406634de6f22a290abb414e80a7747927368b68
2024-03-25 21:59:11 +00:00
Andrew Scull
f50a2e1c2d Merge "Require proper DICE if StrongBox is present" into main am: 6cb40f35b6 am: ce5c85e2c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3009660

Change-Id: I6966aa039553123f5ce9bc8cc1f665d19f853f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 21:32:35 +00:00
Doug Ferraz
b6553785e6 Bluetooth HCI: Add VTS requirement for HCI 4.2 am: 83b2267b78 am: 9b6cbb058d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3011716

Change-Id: Ib9cc327b427160b1ecd89c6d0f8fbd4a56804653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 21:32:03 +00:00
Andrew Scull
ce5c85e2c3 Merge "Require proper DICE if StrongBox is present" into main am: 6cb40f35b6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3009660

Change-Id: Id057617d4fe5c10448f02a6aa8c4c316ec9e32aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 21:15:10 +00:00
Doug Ferraz
9b6cbb058d Bluetooth HCI: Add VTS requirement for HCI 4.2 am: 83b2267b78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3011716

Change-Id: I54691feca15b77de2a0ccf5b10306f6aeb84bb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 21:14:58 +00:00
Andrew Scull
6cb40f35b6 Merge "Require proper DICE if StrongBox is present" into main 2024-03-25 20:57:47 +00:00
Doug Ferraz
2984a75096 Bluetooth HCI: Add VTS requirement for HCI 4.2 - HIDL version
Bug: 285456310
Test: atest VtsHalBluetoothV1_1TargetTest
Change-Id: I0af583e35428f8ec8c9c360d9e28c1c909ad9001
2024-03-25 16:37:29 -04:00
Steve Pomeroy
9cd1970b9b Add VSR min API level
Bug: 331231122
Test: atest VtsNfcBehaviorChangesTest
Change-Id: I6685e75f04330c9f5d497ce219d8da00a753ffdf
2024-03-25 20:10:36 +00:00
Doug Ferraz
83b2267b78 Bluetooth HCI: Add VTS requirement for HCI 4.2
Bug: 285456310
Test: atest VtsHalBluetoothTargetTest
Change-Id: I056b924543ac349beb9b0eddaf039b0aa9187821
2024-03-25 14:52:55 -04:00
Treehugger Robot
6b96e8ec9b Merge "Specified in INFO_MAKE and INFO_MODEL HAL docs to use public names" into main 2024-03-25 18:47:10 +00:00
Andrew Scull
2146152db9 Require proper DICE if StrongBox is present
If a decice provides a StrongBox KeyMint instance then the default IRPC
instance is required to use a proper, non-degenerate DICE chain.

Expose a function to check whether the CSR contains a proper DICE chain
and use that from VTS to implement the test.

Bug: 302204396
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I90cf070bc2279fc52e0a8e7fd0039d3fdb68c1d7
2024-03-25 18:16:24 +00:00
Mikhail Naganov
50f477ad6a [automerger skipped] audio: Implement blocking in remote submix when there is no sink am: a41ff5134d am: f682e02ff2 -s ours
am skip reason: Merged-In Ia66cb7b4567d42a41bf4715b7d725d36510ac50c with SHA-1 6507376fb9 is already in history

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

Change-Id: Id4f6888bb717c880ec331728bb478aef103d57e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 18:10:51 +00:00
Mikhail Naganov
f682e02ff2 audio: Implement blocking in remote submix when there is no sink am: a41ff5134d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3009658

Change-Id: Ie71efa7ec303bb311b546e28db3d71b428c46c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 17:56:26 +00:00
Mikhail Naganov
41e1e9e50c audio: Implement blocking in remote submix when there is no sink am: 6507376fb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/26684914

Change-Id: I6a4a1b6c0eab6808db990e3bc341e9945812a1b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 16:14:25 +00:00
Mikhail Naganov
a41ff5134d audio: Implement blocking in remote submix when there is no sink
The HIDL implementation blocked for the audio buffer duration
when the output side of the remote submix pipe does not have
the sink connected. This behavior was accidentally removed
when fixing b/327220024.

Also, limit the amount of the debug messages displayed when
the sink is shutdown to avoid spamming the syslog.

Bug: 328347445
Test: repro steps from the bug
Test: atest VtsHalAudioCoreTargetTest
Test: atest --test-filter=".*AudioPlaybackCaptureTest.*" CtsMediaAudioTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6507376fb940198e8c39ad6d5345d132b1dd7219)
Merged-In: Ia66cb7b4567d42a41bf4715b7d725d36510ac50c
Change-Id: Ia66cb7b4567d42a41bf4715b7d725d36510ac50c
2024-03-25 16:04:27 +00:00
Yuyang Huang
8b3add91f9 Merge "Adapt CheckApfIsSupported for VSR-15 compatibility" into main am: b959192690 am: 0e8bea62dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2968205

Change-Id: Ibd8f85dd63176654c2bc2d031a980011ec3deccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 07:24:24 +00:00
Yuyang Huang
0e8bea62dd Merge "Adapt CheckApfIsSupported for VSR-15 compatibility" into main am: b959192690
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2968205

Change-Id: I13f2bb0fda3faa75ca5fd1b2249babbd671c3b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-25 07:10:03 +00:00
Yuyang Huang
b959192690 Merge "Adapt CheckApfIsSupported for VSR-15 compatibility" into main 2024-03-25 06:51:10 +00:00
Treehugger Robot
dfaf902393 Merge "Update APF VTS for VSR-14 compliance" into main am: f3f6e5b2cd am: 46836057e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3005171

Change-Id: I1834a81572bddebcc35ccd227aaa6409fc54ee61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-23 02:08:00 +00:00
Treehugger Robot
46836057e0 Merge "Update APF VTS for VSR-14 compliance" into main am: f3f6e5b2cd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3005171

Change-Id: Ib7fe2edeedb641e13ef1efcd842b1d502397f1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-23 01:50:19 +00:00
Treehugger Robot
f3f6e5b2cd Merge "Update APF VTS for VSR-14 compliance" into main 2024-03-23 01:26:24 +00:00
Mikhail Naganov
6507376fb9 audio: Implement blocking in remote submix when there is no sink
The HIDL implementation blocked for the audio buffer duration
when the output side of the remote submix pipe does not have
the sink connected. This behavior was accidentally removed
when fixing b/327220024.

Also, limit the amount of the debug messages displayed when
the sink is shutdown to avoid spamming the syslog.

Bug: 328347445
Test: repro steps from the bug
Test: atest VtsHalAudioCoreTargetTest
Test: atest --test-filter=".*AudioPlaybackCaptureTest.*" CtsMediaAudioTestCases
Change-Id: Ia66cb7b4567d42a41bf4715b7d725d36510ac50c
2024-03-22 13:05:48 -07:00
Mikhail Naganov
7f50205333 Merge "audio: Adjust stream buffer size calculation" into main am: 222d034461 am: a5855a1592
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3008508

Change-Id: I8484832349e3af69cec9ca2a56f315f225b83427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 04:08:11 +00:00
Mikhail Naganov
a5855a1592 Merge "audio: Adjust stream buffer size calculation" into main am: 222d034461
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3008508

Change-Id: I47bd8717653bc48d3fde37c139f373e6d7bce517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 03:53:32 +00:00
Mikhail Naganov
222d034461 Merge "audio: Adjust stream buffer size calculation" into main 2024-03-22 03:36:44 +00:00