Commit Graph

47255 Commits

Author SHA1 Message Date
Eran Messeri
e7a36fadae Merge "Update default KeyMint version to 3" am: 4a7c3810fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2633329

Change-Id: I14f68456f67813ac799a202105a3931efff426aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 17:15:04 +00:00
Eran Messeri
4a7c3810fc Merge "Update default KeyMint version to 3" 2023-06-29 16:37:48 +00:00
Myles Watson
288283d9c5 Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5c3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2643490

Change-Id: Icd489ad746a5270d4850faf8f1fabb3664c0a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 14:37:38 +00:00
Myles Watson
0e55fec5c3 Merge "Fix bluetooth AIDL restart fail when open HCI Fail" 2023-06-29 13:55:26 +00:00
Jesus Sanchez-Palencia
2a12f7e9a4 Merge "lights: Add Rust backend to the lights AIDL" am: 3004ccf550
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2628630

Change-Id: I5b55ab5b105e13980ce40f744c6dfaaa5546f45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 23:29:21 +00:00
Jesus Sanchez-Palencia
3004ccf550 Merge "lights: Add Rust backend to the lights AIDL" 2023-06-28 22:38:47 +00:00
yanggang.yang
6ebe251322 Fix bluetooth AIDL restart fail when open HCI Fail
[Description]
If aidl open HCI fail at the first time, the aidl state
can not change to enable for the next time to initialize.

[Root Cause]
Bluetooth AIDL State is always equal to INITIALIZING after
open hci fail at the first time.

[Solution]
When open HCI fail at the first time, initialize the mstate to ready

Bug: 285517442
Test: pass

Change-Id: I19756d6602ba931242d0f95942db55c505a210bb
2023-06-28 09:13:57 +00:00
Mikhail Naganov
7e18503e54 audio: Allow Module subclasses to customize stream creation am: 9d16a6ac10
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639437

Change-Id: Iaf04f4a8639f78dd4d9e56ceb98060f48284354d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:55 +00:00
Mikhail Naganov
3872e306cf audio: Refactor streams implementation am: d5554cfae2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639436

Change-Id: I57e2f9402e67565a6373e1349b177189f09a8c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:53 +00:00
Mikhail Naganov
c135ebc172 audio: Propagate errors from Driver::setConnectedDevices am: 75b59dfb4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639435

Change-Id: Ibdda55b4078bc77351ccc48a97f3ceab007d21b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:51 +00:00
Mikhail Naganov
c4fa12372d audio: Enable use of 'expected_utils' for ScopedAStatus am: 26dc9add8d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639434

Change-Id: If2f829cbb5f70b2072be456aaeaef8f78556dc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:49 +00:00
Mikhail Naganov
f3121325bc audio: Pass flags and I/O handle to StreamContext am: b42a69ef68
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639433

Change-Id: I55985bc7a4dd84e10cb9f5f5c4b61ff5394b0798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:47 +00:00
Mikhail Naganov
9e3b3d013a audio: Facilitate extension of Module class by vendors am: 57f0dcf78d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2639432

Change-Id: I11be8c69da2f746e973495b58b2d6d4132f25058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 18:29:43 +00:00
Mikhail Naganov
9d16a6ac10 audio: Allow Module subclasses to customize stream creation
Since specializations of the 'Module' class likely need
to provide their own specializations for streams, provide
virtual methods for them.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iddb1bff9f11bc867aba61897ea2f8b9bc3c27544
2023-06-26 17:32:01 -07:00
Mikhail Naganov
d5554cfae2 audio: Refactor streams implementation
Simplify the experience of implementing stream variants.
Stream class now exposes two interfaces: DriverInterface
and StreamCommonInterface, which represent the two
aspects of its usage: via the FMQ on the worker thread,
and via IStreamCommon Binder interface.

Input/output streams now inherit the concrete stream
variant, and implement interface methods specific for
IStreamIn and IStreamOut.

Added DriverInterface::shutdown method which is called
on the worker thread prior to the exit.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I5bf8da2f22b27f0e284a41fc30b920d87ac2936c
2023-06-26 17:32:01 -07:00
Mikhail Naganov
75b59dfb4e audio: Propagate errors from Driver::setConnectedDevices
Plumb propagation of errors reported by the implementations
of DriverInterface::setConnectedDevices up to the Module.
This allows returning the reported errors from the corresponding
IModule interface methods. Implement handling of errors
from connection state update by the Module implementation.

When updating streams about the connection status
ensure that the list of connected devices is not empty.

Also, add an extra check to AudioStreamIn#ActiveMicrophones
to validate the size of the returned active microphones
list.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I62a422d95c37a672fce4ad221bea435cc7b4ebfa
2023-06-26 17:32:01 -07:00
Mikhail Naganov
26dc9add8d audio: Enable use of 'expected_utils' for ScopedAStatus
Add necessary helper functions and use
RETURN_STATUS_IF_ERROR where possible.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: If68c995da0e5e0cb2e9c142ba40af6503ff628b2
2023-06-26 17:32:01 -07:00
Mikhail Naganov
b42a69ef68 audio: Pass flags and I/O handle to StreamContext
Vendor implementations may need to see the value of flags
and the I/O handle of the mix port used to open the stream.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: If1f346793f3b3a725bc19358909f5b461cb159c1
2023-06-26 17:32:01 -07:00
Mikhail Naganov
57f0dcf78d audio: Facilitate extension of Module class by vendors
Make interface methods protected so that subclasses can
augment them.

Provide getters for private fields.

Bug: 282568751
Test: atest VtsHalAudioCoreTargetTest
Change-Id: I0e4810f8a4c816c4f673139816e9768f6dc8da7c
2023-06-26 17:32:01 -07:00
Xin Li
73fbb4f368 [automerger skipped] Merge "Merge Android 13 QPR3" am: 377be1fa1b -s ours
am skip reason: Merged-In I054707abb86a406dfb3ce4f211338107da0a6582 with SHA-1 8cf1bf3f00 is already in history

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

Change-Id: I7775f53087536033ca65c482e63276cf329868a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:00:19 +00:00
Xin Li
3123f61459 [automerger skipped] Merge Android 13 QPR3 am: 6c136ebd48 -s ours
am skip reason: Merged-In I054707abb86a406dfb3ce4f211338107da0a6582 with SHA-1 8cf1bf3f00 is already in history

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

Change-Id: Ide5c10f41ecaf6855f5ec20d5a7327c7684a7f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:58:06 +00:00
Xin Li
377be1fa1b Merge "Merge Android 13 QPR3" 2023-06-26 22:29:51 +00:00
Jesus Sanchez-Palencia
b990a93646 lights: Add Rust backend to the lights AIDL
This enables us to write a lights service in Rust.

Bug: 286106270
Tested: Verified with a WIP replacement for the Lights example service.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a37bed645683cec20b67b8303aa8e3f6ac08f32a)
Change-Id: I6f9838ea711fb194ac9b9f7b3c29eeb87491beb8
2023-06-26 13:48:50 -07:00
Treehugger Robot
44502769e4 Merge "Check for MGF1 digests in key characteristics." am: efb4b9397a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2552043

Change-Id: If89b0a44c0a7aee281c9eda5d59b4eae6ecf65a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 17:45:01 +00:00
Deyao Ren
ec07ad1795 Merge changes from topic "cherry-pick-b210883464" am: ed0da8c243
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2636312

Change-Id: I82fb5878885a097fdb220058190783a83a7431e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 17:43:06 +00:00
Treehugger Robot
efb4b9397a Merge "Check for MGF1 digests in key characteristics." 2023-06-26 17:22:09 +00:00
Deyao Ren
ed0da8c243 Merge changes from topic "cherry-pick-b210883464"
* changes:
  Fixes sensors AIDL default impl APEX's binary name.
  Cuttlefish sensors apex uses aidl implementation
2023-06-26 16:55:03 +00:00
Shunkai Yao
1e58a2b6dd Merge "Format VTS test code" am: e0ade8fe67
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2636889

Change-Id: Iab4b905399e97d7c5ac129a0b462ae5f9aaa2949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 18:11:52 +00:00
Shunkai Yao
e0ade8fe67 Merge "Format VTS test code" 2023-06-23 17:19:15 +00:00
Austin Foxley
8ab843feb5 Merge "contexthub: Enable rust bindings" am: de20b45a51
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2580931

Change-Id: I6f476c6df69394266d28228d8e4fed2687f66ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 15:32:00 +00:00
Austin Foxley
de20b45a51 Merge "contexthub: Enable rust bindings" 2023-06-23 15:00:35 +00:00
Shunkai Yao
68cceeb6c7 Merge "aidl: Improve Effect VTS naming" am: 187b6b7ece
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2627771

Change-Id: Ifd58ebaa789dabfb8ee398e8543279c28a6b0b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 05:00:31 +00:00
Shunkai Yao
9e60e635bf Format VTS test code
Bug: 287430121
Test: atest VtsHalAudioEffectTargetTest
Change-Id: Iecc0c9388c6596cf5a25918f8f0af0495b2133a6
2023-06-23 04:34:50 +00:00
Shunkai Yao
187b6b7ece Merge "aidl: Improve Effect VTS naming" 2023-06-23 04:01:02 +00:00
Daniel Norman
d20ebb4f6f Fixes sensors AIDL default impl APEX's binary name.
commit bde01c60fa
moved this APEX from the HIDL to AIDL impl, but accidentally
left out the rename of the binary in the file_contexts

Also deletes unused .rc file here; the APEX already reuses the
.rc file from outside the APEX dir.

Bug: 222579208
Test: Build cf_x86_64_phone using sensors APEX: http://ab/P33964358
      Boot the device, use accel sensor to rotate the screen.
Change-Id: Ib107770312bb80b67364c855efd2df3a9bc52b9a
(cherry picked from commit 80e55dabf3)
2023-06-22 18:36:36 +00:00
deyaoren@google.com
1e1887e055 Cuttlefish sensors apex uses aidl implementation
Bug: 210883464
Test: atest hal_implementation VtsAidlHalSensorsTargetTest
Tests run on abtd:
https://android-build.googleplex.com/builds/abtd/run/L63300000953949688
https://android-build.googleplex.com/builds/abtd/run/L18600000953935211
One test is failing on tip of tree

(cherry picked from commit bde01c60fa)
Change-Id: Iec27e916c94e5a327fc6c4d87451e055b14d9660
2023-06-22 18:21:43 +00:00
David Drysdale
013030d9a4 Merge "Allow extra error code in device ID attestation" am: 1d7447e5d3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2627969

Change-Id: Icf60bf50235b71ef4205267c1b6c781c00a5267c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 06:38:51 +00:00
David Drysdale
1d7447e5d3 Merge "Allow extra error code in device ID attestation" 2023-06-22 05:58:57 +00:00
Xin Li
6c136ebd48 Merge Android 13 QPR3
Bug: 275386652
Merged-In: I054707abb86a406dfb3ce4f211338107da0a6582
Change-Id: I53d29d621a262cd96d4768850425ca04202644c7
2023-06-21 15:16:02 -07:00
Eran Messeri
8417708fe4 Update default KeyMint version to 3
Update the default KeyMint version to v3.
Note this affects the pure software implementation of KeyMint that is
not used for anything that tests currently run against.

Bug: 275982952
Test: m (that it builds)
Change-Id: I6ab10329af590bd2a045710dfff47c6e78740464
2023-06-21 16:11:25 +01:00
Dan Shi
8cf1bf3f00 Merge "Test: Don't check results when no type-c ports" am: 7e9eece7b3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2583450

Change-Id: I054707abb86a406dfb3ce4f211338107da0a6582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 05:46:30 +00:00
Dan Shi
7e9eece7b3 Merge "Test: Don't check results when no type-c ports" 2023-06-21 04:56:08 +00:00
Jaideep Sharma
e4c7a96789 aidl: Improve Effect VTS naming
Use uuid in hexadecimal format in testcase name.

Change-Id: Ib687b6617060e4400a767f23ca0b26cece4005f1
2023-06-16 05:58:43 +00:00
Changyeon Jo
b484054880 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b am: 55baee93d6 am: 4bf0cb2c5f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: I74e22a7195fb761c3920b7fd865b000d0a4d3ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 01:16:37 +00:00
Changyeon Jo
4bf0cb2c5f Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b am: 55baee93d6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: I8ac30fb5abe6c6205d099d089e769ffb477ddc7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:32:36 +00:00
Changyeon Jo
55baee93d6 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: Ic0db29743b092a5a2d01860e76356a38e3e4788b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:04:30 +00:00
Changyeon Jo
c070b5a14b Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: Ibcaac170949c319d2cff5b45bc8114238d0ada7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 23:21:50 +00:00
Changyeon Jo
a343d0cf0c Increase frame counters in the same critical section am: 928a4535c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: I8a59e6173179a284bb90960b30e2e5a35de075a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 22:39:21 +00:00
Changyeon Jo
928a4535c8 Increase frame counters in the same critical section
Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest
Change-Id: I814aac4edec142027d3802f5ee0d7a444ae2ee86
2023-06-15 21:11:09 +00:00
David Drysdale
f42238c99f Allow extra error code in device ID attestation
Generalize the existing helper function to allow more variants.

Remove a couple of pointless invocations of the existing helper.

Bug: 286733800
Test: VtsAidlKeyMintTargetTest
Change-Id: Ic01c53cbe79f55c2d403a66acbfd04029395c287
2023-06-15 09:43:18 +01:00