Commit Graph

32698 Commits

Author SHA1 Message Date
TreeHugger Robot
00487b339f Merge changes I0b38a98a,I6f8e6ec1 into sc-dev am: 4f53440f87
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15193438

Change-Id: I9f6371e31064ecc91087cf0be1952dc79ed8bfc8
2021-07-07 20:39:14 +00:00
TreeHugger Robot
4f53440f87 Merge changes I0b38a98a,I6f8e6ec1 into sc-dev
* changes:
  IFace: update VTS tests
  IFace: update default implementation
2021-07-07 20:22:39 +00:00
TreeHugger Robot
eb4b61958e Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev am: 8c5166b2f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15223272

Change-Id: Id68989d25d51a31aa4275dbccb9601ae3b81c5bf
2021-07-07 18:34:53 +00:00
TreeHugger Robot
8c5166b2f5 Merge "Revert "audio: exclude the echo reference device in capture position test"" into sc-dev 2021-07-07 18:17:25 +00:00
Mikhail Naganov
dd0e20eba3 Revert "audio: exclude the echo reference device in capture position test"
This reverts commit b22f307ccf.

Reason for revert: As explained in b/192307382#comment12, the HAL must provide capture positions for the echo reference input regardless of whether there is any actual output.

This should not affect O6/R4 as according to b/192307382#comment10, the VTS tests pass w/o this patch after the HAL has been fixed.

Bug: 192307382
Change-Id: I224bd9de1dcb2e2c8dc138dbfd85f848378aea4f
Test: VtsHalAudioV7_0TargetTest --gtest_filter=*PcmOnlyConfigInputStreamTest*
2021-07-07 17:07:15 +00:00
Ilya Matyukhin
6bf1146fb6 IFingerprint: update VTS tests am: 04247248ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15192112

Change-Id: I414cf8a5954141cd19cda0b84c5932b3f977b6e0
2021-07-03 01:49:57 +00:00
Ilya Matyukhin
37ff41de0b IFingerprint: update default implementation am: 1d52438592
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15192111

Change-Id: Iaa1b6ae728785456c2f5054b4d26713d8dc557af
2021-07-03 00:11:41 +00:00
Ilya Matyukhin
046020b149 IFace: update VTS tests
Bug: 170650876
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: I0b38a98acaec654b144dbe56fc64c5c741bd4488
2021-07-03 00:10:19 +00:00
Ilya Matyukhin
60406beac6 IFace: update default implementation
Bug: 170651283
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: I6f8e6ec12e597034264e2b1383bc7325b0f697b7
2021-07-03 00:10:03 +00:00
Ilya Matyukhin
04247248ce IFingerprint: update VTS tests
Bug: 166799066
Test: VtsHalBiometricsFingerprintTargetTest
Change-Id: I2bf765890203a4edc016d1b7f0abd1d205b2a0ba
2021-07-02 23:58:58 +00:00
Ilya Matyukhin
1d52438592 IFingerprint: update default implementation
Bug: 166800618
Test: atest VtsHalBiometricsFingerprintTargetTest
Change-Id: I0ac3a019081f4f5db6943fc019165ad1aa2e0bc8
2021-07-02 23:58:14 +00:00
Les Lee
3a76abb9a6 Merge "WIFI: Set MAC address for bridged interface" into sc-dev am: 53bd75df19
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15142236

Change-Id: I82823e6054e3f1da3d9401a7cd8f6b58c4b4a501
2021-07-02 09:56:03 +00:00
Les Lee
53bd75df19 Merge "WIFI: Set MAC address for bridged interface" into sc-dev 2021-07-02 09:43:13 +00:00
Les Lee
da9f5fe137 WIFI: Set MAC address for bridged interface
The MAC address of the bridged interface will be dynamically generated
by kernel when any bridged iface is changed. This means that the
bridged interface MAC address will be changed when we remove one of the
instances from the bridged interface (shutdown unused interface case).
The MAC change will break operation of bpf and it may cause the SAP
client to send wrong ns packets because the tethering module is
still using the old MAC in the ra packet.

Always set MAC address so the bridged interface can avoid MAC changing.

Bug: 191611764
Bug: 192315721
Test: Manual test with IPv6 tethering. Make sure client won't disconnect
because it doesn't get na response.
Test: Manual test in two scenarios: 1. MAC randomization 2. reset to factory MAC.

Change-Id: I854fc74b6532824b7d7b5a1aa4bc20a3cf9fd588
2021-07-02 12:05:57 +08:00
Jimmy Chen
55b41e6088 Merge "wifi: add 1.5 HIDL service in lazy rc" into sc-dev am: 29682d341b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15165949

Change-Id: If08f07727b8d6b1370d054c27195ca71b4c0256b
2021-07-02 02:49:23 +00:00
Jimmy Chen
29682d341b Merge "wifi: add 1.5 HIDL service in lazy rc" into sc-dev 2021-07-02 02:36:02 +00:00
Seth Moore
0a8eed8766 Correct the description for getKeyCharacteristics am: 8b78dc5031
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15175667

Change-Id: Id8664ee643a3241803210ae4a37cc3af01a7c112
2021-07-01 20:09:38 +00:00
Seth Moore
8b78dc5031 Correct the description for getKeyCharacteristics
The description should note that keystore-enforced tags are not to be
returned. This is done so that the keymint implementation doesn't have
to bother keeping track of tags it's not repsonsible for dealing with.

Fixes: 192575557
Test: none (it's just a comment change)
Change-Id: I3ff94201c262a5071d271b150dbbf21888d678aa
Merged-In: I3ff94201c262a5071d271b150dbbf21888d678aa
2021-07-01 11:39:13 -07:00
Carter Hsu
ebd33b28a3 Merge "audio: exclude the echo reference device in capture position test" into sc-dev am: 0700d79feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15152137

Change-Id: I6b6b6103d621535a335f9f4ef63442a880c948be
2021-07-01 09:40:22 +00:00
Carter Hsu
0700d79feb Merge "audio: exclude the echo reference device in capture position test" into sc-dev 2021-07-01 09:25:25 +00:00
Jimmy Chen
f5a84a2322 wifi: add 1.5 HIDL service in lazy rc
1.5 HIDL service is not declared in lazy init rc.

Bug: 191940153
Test: atest VtsHalBaseV1_0TargetTest
Change-Id: Idc4d01e9696c35c8fc2390a2639ff8d7ebf0bbf0
2021-07-01 16:26:06 +08:00
Ilya Matyukhin
e171a51b0f Merge "IFingerprint: update comments" into sc-dev am: b09f62d6a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15159443

Change-Id: I38459e322fdbf1c1c8dec2a8be3c518842d6c3b0
2021-07-01 07:45:04 +00:00
Ilya Matyukhin
11145fa880 Merge "IFace: update comments" into sc-dev am: 4d00d917b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15159444

Change-Id: I6d41a1cf043e0995fa1f43d439fc86af552b2cc7
2021-07-01 07:36:43 +00:00
TreeHugger Robot
192dd17b5f Merge "memtrack: Update AIDL memtrack hal documentation" into sc-dev am: 43a512529d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15155518

Change-Id: Icd79014181da1ad77685e5eabc03a77ed9f8eed3
2021-07-01 07:02:49 +00:00
Seth Moore
0a7f1ab966 Add a utility to JSON-format a CSR with build info am: 23f624599f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15115450

Change-Id: I4df58cae6515681e04b880da43c80f7f9c98ed7b
2021-07-01 06:51:59 +00:00
Ilya Matyukhin
b09f62d6a6 Merge "IFingerprint: update comments" into sc-dev 2021-06-30 21:38:59 +00:00
Ilya Matyukhin
4d00d917b6 Merge "IFace: update comments" into sc-dev 2021-06-30 21:38:47 +00:00
TreeHugger Robot
43a512529d Merge "memtrack: Update AIDL memtrack hal documentation" into sc-dev 2021-06-30 20:58:57 +00:00
Kalesh Singh
90e4a2f96e memtrack: Update AIDL memtrack hal documentation
Fix Memtrack GRAPHICS type definition to also inculde
GPU-mapped DMA-BUF memory.

Clarify SMAPS_UNACCOUTNED should also include memory
mapped with VM_PFNMAP set.

Bug: 192384999
Test: N/A
Change-Id: I5370efa731bc6307e4fe9b454796361e9a1ac5eb
Merged-In: I5370efa731bc6307e4fe9b454796361e9a1ac5eb
2021-06-30 20:53:44 +00:00
Ilya Matyukhin
ea8115d85d IFingerprint: update comments
Bug: 166824758
Test: N/A
Change-Id: Ie77034b88bea1c1317e8d057f19f57167d48d2c3
2021-06-30 18:27:27 +00:00
Ilya Matyukhin
8b372b6734 IFace: update comments
Bug: 152412683
Test: N/A
Change-Id: I4bae4ba9eaa5631d72d5665b54dd5c2b23f7f4d5
2021-06-30 18:26:35 +00:00
Seth Moore
23f624599f Add a utility to JSON-format a CSR with build info
We need both the build fingerprint as well as the CSR when uploading
data to the APFE provisioning server. Add a utility function to format
the output as a JSON blob so that it may be easily collected in the
factory in a serialized data format, then later uploaded.

Test: libkeymint_remote_prov_support_test
Test: VtsAidlKeyMintTargetTest
Test: VtsHalRemotelyProvisionedComponentTargetTest
Bug: 191301285
Change-Id: I751c5461876d83251869539f1a395ba13cb5cf84
2021-06-30 09:32:08 -07:00
Carter Hsu
b22f307ccf audio: exclude the echo reference device in capture position test
Bug: 192307382
Test:
VtsHalAudioV7_0TargetTest --gtest_filter=*PcmOnlyConfigInputStreamTest*
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I4e38e093bc3be7ee54c0c7cce4d1181e260a23bb
2021-06-30 06:55:24 +00:00
Ilya Matyukhin
1b6ab3f169 IFace: Add more comments am: ba83133139
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15146596

Change-Id: I96be99d6fc0540244127df89fe52bd373fd2233a
2021-06-29 23:36:24 +00:00
Ilya Matyukhin
ba83133139 IFace: Add more comments
Bug: 152412683
Test: N/A
Change-Id: I0d444804acdd7e063c411cc2dec05efb26c6facf
2021-06-29 21:44:17 +00:00
David Drysdale
f886c47f88 Merge "KeyMint VTS: allow for stricter SharedSecret impls" into sc-dev am: 8e8698913a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15128553

Change-Id: I943b47028b51d266960f6242e399af91f8fda9e5
2021-06-29 06:03:10 +00:00
David Drysdale
8e8698913a Merge "KeyMint VTS: allow for stricter SharedSecret impls" into sc-dev 2021-06-29 05:49:21 +00:00
David Drysdale
d6471a0740 KeyMint HAL: clarify spec text am: 382e34835d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15108861

Change-Id: I15e007f492a04c473e33a6f30eab90283df74e4c
2021-06-29 05:39:49 +00:00
David Drysdale
382e34835d KeyMint HAL: clarify spec text
- Make clear that CERTIFICATE_NOT_{BEFORE,AFTER} must be specified for
   generating/importing asymmetric keys.
 - Fix enforcement level of Tag::UNLOCKED_DEVICE_REQUIRED.
 - Fix reference to exportKey() for Tag::STORAGE_KEY to mention
   convertStorageKeyToEphemeral instead.
 - Mark Tag::CONFIRMATION_TOKEN as deprecated.

Test: none, comment change
Bug: 188672564
Merged-In: I68727b024f6b6743403941763aefca64e3eb091a
Change-Id: I68727b024f6b6743403941763aefca64e3eb091a
Ignore-AOSP-First: already merged in aosp/master
2021-06-28 18:15:14 +01:00
David Drysdale
62272fc2f5 KeyMint VTS: allow for stricter SharedSecret impls
Bug: 192223752
Test: VtsAidlSharedSecretTargetTest
Merged-Ind: Iccf2d0fe2a2d10ad12269dfecf78ea1d831c3ad4
Change-Id: Iccf2d0fe2a2d10ad12269dfecf78ea1d831c3ad4
Ignore-AOSP-First: already merged in aosp/master
2021-06-28 18:02:36 +01:00
Lev Proleev
a6df2b207c Fix ordering of cache files requirements from device am: 3fd4ec4706
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15126842

Change-Id: I194be847e07ac8b0a378090c8648436ad6373acc
2021-06-28 15:11:53 +00:00
Lev Proleev
3fd4ec4706 Fix ordering of cache files requirements from device
Data and model numbers were switched in the AIDL implementation of
canonical Device.

Bug: 190757709
Test: neuralnetworks_utils_hal_aidl_test
Change-Id: I0d95b2d436994ffc877a4e02eb31f449b983e61e
2021-06-28 12:16:02 +00:00
Seth Moore
66fe9f97d8 Add real GEEK for RKP factory enrollment am: 415f0ce4fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15071133

Change-Id: Ia5a62389c5805133e8c31e9b755f7fe019ae148d
2021-06-25 16:10:10 +00:00
Seth Moore
9e9600a82f Add a unit test for remote_prov_utils am: 7a55bb5cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15071132

Change-Id: I1995076ea3d87dd7c267a39e10603822d012234a
2021-06-25 16:10:07 +00:00
Seth Moore
415f0ce4fe Add real GEEK for RKP factory enrollment
Include a unit test to verify the GEEK cert chain is valid.

Test: libkeymint_remote_prov_support_test
Ignore-AOSP-First: No merge path to aosp, will manually merge
Bug: 191301285
Change-Id: Icf9cfa165fbccb24b36b03ff3ce729a7e9c44cfd
2021-06-23 13:05:59 -07:00
Seth Moore
7a55bb5cf8 Add a unit test for remote_prov_utils
This functionality will be used for the factory tooling, so we should
test it. Additionally, some new functionality will soon be added, and
it also needs to be tested.

Ignore-AOSP-First: No merge path to aosp, will manually merge
Test: libkeymint_remote_prov_support_test
Bug: 191301285
Change-Id: I6a8798fc4b09fff1e829185a4b9e471921e5d2a9
2021-06-22 17:54:34 -07:00
Yu-Han Yang
3aa6bf65da Merge "Fix ADR half cycle ambiguity doc (hardware/interfaces)" into sc-dev am: 9f834f1a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14948497

Change-Id: I397c3aec2e00a069d9976dc05e69276b97f20077
2021-06-22 19:33:10 +00:00
Yu-Han Yang
9f834f1a91 Merge "Fix ADR half cycle ambiguity doc (hardware/interfaces)" into sc-dev 2021-06-22 19:07:54 +00:00
TreeHugger Robot
6dcc9be73b Merge "Remove ignoreSignature for cose signature checks" into sc-dev am: 1aa95b63d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15016110

Change-Id: I59c11c3b47d493875ef2bbc77a99869057ecc338
2021-06-22 17:44:41 +00:00
TreeHugger Robot
1aa95b63d0 Merge "Remove ignoreSignature for cose signature checks" into sc-dev 2021-06-22 17:21:13 +00:00