Commit graph

28726 commits

Author SHA1 Message Date
Mikhail Naganov
420a5407cd audio: Fix handling of relative XML include paths in VTS
Pass "no fixup base dirs" flag to the XInclude processor
to avoid modifications of the top-level elements from
included XML files as a result of "fixup."

Added tests to ensure that all relevant XInclude scenarios
work.

Bug: 192619060
Test: atest -host android.hardware.audio.common.test.utility_tests
Change-Id: Id595c9fd30be378d76387ee55a8937e0bf28d1cd
Merged-In: Id595c9fd30be378d76387ee55a8937e0bf28d1cd
2021-07-08 17:29:23 +00:00
Kris Alder
8ec315a25e Merge changes I580e3f1d,I8e271982
* changes:
  android.hardware.bluetooth@1.0-impl: Updated to vendor_available:true
  android.hardware.bluetooth@1.0-impl: Updated Android.bp
2021-07-08 16:12:16 +00:00
Eran Messeri
9c3bd29cab Merge "KeyMint: Fix device-unique attestation chain specification" 2021-07-06 15:38:16 +00:00
Eran Messeri
302d29eb9b Merge "Annotate some TODOs" 2021-07-06 13:40:53 +00:00
Eran Messeri
03d7a1a4f3 KeyMint: Fix device-unique attestation chain specification
Fix the device-unique attestation chain specification: The chain should
have two or three certificates.
In case of two certificates, the device-unique key should be used for
the self-signed root.
In case of three certificates, the device-unique key should be certified
by another key (ideally shared by all StrongBox instances from the same
manufacturer, to ease validation).

Adjust the device-unique attestation tests to accept two or three
certificates in the chain.

Additionally, the current StrongBox KeyMint implementation can not yet
generate fully-valid chains (with matching subjects and issuers), so
relax that check.

Bug: 191361618
Test: m VtsAidlKeyMintTargetTest
Change-Id: I6e6bca33ebb4af67cac8e41a39e9c305d0f1345f
2021-07-06 14:32:16 +01:00
Eran Messeri
7c046786b8 Annotate some TODOs
There are two tags that cannot be currently removed but should be
removed in KeyMint V2. Mark them as deprecated and point to the bug
for deletion.

Bug: 183737811
Test: That it compiles.
Change-Id: I80ccaedeb777fdb249a8cb021db6628da32d6029
2021-07-06 10:46:57 +01:00
Seth Moore
42c1133fed Add ensuring that test BCC keys not unique ids
Get two test BCCs, then ensure that no repeated keys are found.

Bug: 192687735
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I48f86e7dfa9ab4bc6303a8d1b64ac7ca6ac76bbf
Merged-In: I48f86e7dfa9ab4bc6303a8d1b64ac7ca6ac76bbf
2021-07-02 15:58:26 -07:00
Seth Moore
f4c8ff9bef 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-07-01 10:17:28 -07:00
Treehugger Robot
0ab5ef3ff7 Merge changes from topic "rkp-factory-tool"
* changes:
  Add real GEEK for RKP factory enrollment
  Add a unit test for remote_prov_utils
2021-06-30 20:39:53 +00:00
Kalesh Singh
55305df1ff Merge "memtrack: Update AIDL memtrack hal documentation" 2021-06-30 18:45:42 +00:00
Treehugger Robot
229d55513b Merge "CEC: Add implementation of WAKEUP option to default HdmiCec" 2021-06-30 11:52:03 +00:00
Treehugger Robot
22135d775e Merge "CEC: Add implementation of ENABLE_CEC option to default HdmiCec" 2021-06-30 11:41:43 +00:00
Treehugger Robot
dba159dcfd Merge changes Iaaec9a0a,I280d1424,Ic8a65044,I019cb5cf,I245d52a7, ...
* changes:
  CEC: Add event handler to default HdmiCec
  CEC: Add implementation of setCallback method to default HdmiCec
  CEC: Add implementation of addLogicalAddress method to default HdmiCec
  CEC: Add implementation of getCecVersion method to default HdmiCec
  CEC: Add implementation of isConnected method to default HdmiCec
  CEC: Add implementation of getVendorId method to default HdmiCec
  CEC: Add implementation of getPortInfo method to default HdmiCec
  CEC: Add implementation of clearLogicalAddress method to default HdmiCec
  CEC: Add implementation of getPhysicalAddress method to default HdmiCec
  CEC: Add implementation of SendMessage method to default HdmiCec
  CEC: Initialise the HAL based on default implementation
2021-06-30 10:53:02 +00:00
Kalesh Singh
30fa141c80 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
2021-06-29 21:57:56 +00:00
Treehugger Robot
6738af59c7 Merge "Fix default vibrator HAL to check support on getPrimitiveDuration" 2021-06-28 21:02:48 +00:00
Treehugger Robot
dc46322e5a Merge "Fix ordering of cache files requirements from device" 2021-06-28 18:13:00 +00:00
David Drysdale
17a0526b1e Merge "KeyMint HAL: clarify spec text" 2021-06-28 17:14:23 +00:00
David Drysdale
f854cde530 Merge "KeyMint VTS: allow for stricter SharedSecret impls" 2021-06-28 17:01:22 +00:00
Lev Proleev
a31aff1ace 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
Merged-In: I0d95b2d436994ffc877a4e02eb31f449b983e61e
(cherry picked from commit 3fd4ec4706)
2021-06-28 16:11:43 +01:00
David Drysdale
d46d61efec KeyMint VTS: allow for stricter SharedSecret impls
Bug: 192223752
Test: VtsAidlSharedSecretTargetTest
Change-Id: Iccf2d0fe2a2d10ad12269dfecf78ea1d831c3ad4
2021-06-28 14:58:28 +01:00
David Drysdale
5cf4a11c01 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
Change-Id: I68727b024f6b6743403941763aefca64e3eb091a
2021-06-28 12:43:10 +01:00
Lais Andrade
6d4c0482fc Fix default vibrator HAL to check support on getPrimitiveDuration
Change-Id: I09219cca0a1b0bb985cae70734b0dd03cca441fc
Merged-In: I09219cca0a1b0bb985cae70734b0dd03cca441fc
Fix: 191115802
Fix: 191952216
Test: VtsHalVibratorTargetTest
2021-06-26 05:07:37 +00:00
Seth Moore
50d62b0b15 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
Bug: 191301285
Change-Id: Icf9cfa165fbccb24b36b03ff3ce729a7e9c44cfd
Merged-In: Icf9cfa165fbccb24b36b03ff3ce729a7e9c44cfd
2021-06-25 10:48:49 -07:00
Seth Moore
42a2f6b6e2 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.

Test: libkeymint_remote_prov_support_test
Bug: 191301285
Change-Id: I6a8798fc4b09fff1e829185a4b9e471921e5d2a9
Merged-In: I6a8798fc4b09fff1e829185a4b9e471921e5d2a9
2021-06-25 10:48:33 -07:00
Treehugger Robot
2e74933945 Merge "Allow VTS of 1.0 tetheroffload to be optional" 2021-06-24 21:27:53 +00:00
Treehugger Robot
b54aebc2d8 Merge "Fix flaky corrupted padding tests" 2021-06-24 21:17:33 +00:00
Treehugger Robot
04cdc5ebc1 Merge "Remove ignoreSignature for cose signature checks" 2021-06-24 21:01:52 +00:00
Seth Moore
7a55ae3ddc Fix flaky corrupted padding tests
It's possible that corrupted ciphertext decrypts just fine. e.g. the
output ends with "0x01".

However, the chances of this happening are relatively low
(roughly 1/256). Corrupt the ciphertext up to 8 times, ensuring that
the likelihood of multiple successful decryptions is so miniscule that
it's effectively impossible.

Test: Ran *PaddingCorrupted tests 50000 times
Change-Id: If40ecd7817819921c020ea9b86ada18c4c77ea55
2021-06-24 12:45:23 -07:00
Ayushi Khopkar
eddbb27ae8 android.hardware.bluetooth@1.0-impl: Updated to vendor_available:true
Updated android.hardware.bluetooth@1.0-impl, android.hardware.bluetooth-async
and android.hardware.bluetooth-hci libraries from 'vendor: true' to 'vendor_available: true'

Test: Build android.hardware.bluetooth@1.0-impl
Bug: 187131546

Change-Id: I580e3f1d770bee09880b74189b558ab1c4c4913e
2021-06-24 21:18:16 +05:30
Ayushi Khopkar
0be5891eda android.hardware.bluetooth@1.0-impl: Updated Android.bp
Updated Android.bp to build both static and shared library

Test: Build android.hardware.bluetooth@1.0-impl
Bug: 187131546

Change-Id: I8e2719822937cf716f4f3cea05285abf4385f1fd
2021-06-24 21:18:04 +05:30
Shraddha Basantwani
05c454f356 CEC: Add implementation of WAKEUP option to default HdmiCec
When WAKEUP is set to false, HAL does not wake up the system
upon receiving <Image View On> or <Text View On> messages.

Bug: 185434120
Test: manual
Change-Id: Iaf98020decc887f04b02da480adc70b76189b66d
2021-06-24 16:30:47 +05:30
Shraddha Basantwani
d591d97536 CEC: Add implementation of ENABLE_CEC option to default HdmiCec
When ENABLE_CEC is set to false, all the CEC commands are discarded

Bug: 185434120
Test: manual
Change-Id: Iaf7e61af0b5047b041818acf2590c3ffce2f3318
2021-06-24 16:30:47 +05:30
Junyu Lai
3db2f84815 Allow VTS of 1.0 tetheroffload to be optional
Per defined by compatibility matrixes, the tetheroffload
1.0 hardware is optional. But the tests failed if there
is no tetheroffload 1.0 hardware.
This is a regression during refactoring of the tests.

Test: atest VtsHalTetheroffloadControlV1_0TargetTest
Bug: 176057664
Change-Id: If54151beb3355b049b3f892f45c079cd5170d146
2021-06-24 08:59:41 +00:00
Steven Moreland
5d3dd75690 Merge "Add owner field to android.hardware.tests.extension.vibrator" 2021-06-23 23:28:10 +00:00
Treehugger Robot
a43f14bdac Merge "Replace writepid with task_profiles command for cgroup migration" 2021-06-23 22:33:03 +00:00
Jiyong Park
4118607822 Add owner field to android.hardware.tests.extension.vibrator
This will prevent the interface from being updated with aidl-freeze-api.
As the interface is for testing purpose, we really don't need to keep
the latest ToT version and the latest stable version to be the same.
Exempt that by adding the owner field to the interface.

Bug: 188713899
Bug: 190577319
Test: m

Change-Id: I9a670f763c8f31f7c847f8ba8d4706efa075285e
(cherry picked from commit ad0bed60e9)
Merged-In: I9a670f763c8f31f7c847f8ba8d4706efa075285e
2021-06-23 22:08:49 +00:00
Treehugger Robot
00baab69f1 Merge "Correct grammatical error in README.md" 2021-06-23 20:07:43 +00:00
Suren Baghdasaryan
dd50b2f45d Replace writepid with task_profiles command for cgroup migration
writepid command usage to join a cgroup has been deprecated in favor
of a more flexible approach using task_profiles. This way cgroup path
is not hardcoded and cgroup changes can be easily made. Replace
writepid with task_profiles command to migrate between cgroups.

Bug: 191283136
Test: build and boot
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I249ecc45a001a69d73b06b77154f9b6e5f9964d9
2021-06-23 18:43:27 +00:00
Seth Moore
798188aba0 Remove ignoreSignature for cose signature checks
This flag is never used anywhere, so just remove it. When used, it would
bypass signature checks. This is something we generally don't want to
do, even in testing. So remove the flag so there's no temptation to use
it.

Bug: 190942528
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I0433c1eedc08e9a5a5ad71347154867dba61689e
Merged-In: I0433c1eedc08e9a5a5ad71347154867dba61689e
2021-06-22 18:32:56 -07:00
Junyu Lai
e3dc2f88b2 Merge "[SP32.1] Put OffloadControl 1.1 HAL into apex" 2021-06-22 20:31:18 +00:00
Alan Stokes
fd7eeeaa1d Merge "Allow CompOS APEX to access Keystore AIDL." 2021-06-22 08:13:11 +00:00
rayhdez
5d3fcb2c57 Correct grammatical error in README.md
Bug: 175887156
Test: N/A
Change-Id: Ic89de4ac17ac5d67ff4d4c634c444f167878b7eb
2021-06-22 00:20:07 +00:00
Treehugger Robot
8701205c04 Merge "identity: fix access control checks in libeic." 2021-06-21 20:27:22 +00:00
David Zeuthen
af7e9cfb28 identity: fix access control checks in libeic.
Also add a new libeic_test binary which has a regression test for this
vulnerability.

Bug: 190757775
Test: atest libeic_test
Test: atest VtsHalIdentityTargetTest
Test: atest CtsIdentityTestCases
Merged-In: I8344655c59930d6bf1baa4e0f8d0f60e4fc9e48d
Change-Id: I8344655c59930d6bf1baa4e0f8d0f60e4fc9e48d
2021-06-21 15:13:55 -04:00
Xin Li
472ef6391c Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:03 +00:00
David Drysdale
aedb92d5af Merge changes I33036387,I63ca8d29
* changes:
  KeyMint VTS: require curve for ECDSA keys
  KeyMint VTS: more attestation info tests
2021-06-21 05:30:10 +00:00
Xin Li
69f8f7446c DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: Id0a543a695fec5523410b41a289f2a71cd850b70
Change-Id: Iddab4cc5480ea83283e56514d9bc00319419a714
2021-06-18 12:24:34 -07:00
Shraddha Basantwani
0c8a05440b CEC: Add event handler to default HdmiCec
Event handler polls the file descriptor for
CEC messages and events

Bug: 185434120
Test: manual
Change-Id: Iaaec9a0a74b264e5ec8625d7fce3d821208fd5ac
2021-06-18 20:26:09 +05:30
Treehugger Robot
b8cf151c98 Merge "Updating CDDL schemas to match the finalized spec." am: 11854c2d82
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1720450

Change-Id: Id0a543a695fec5523410b41a289f2a71cd850b70
2021-06-18 14:42:45 +00:00
Treehugger Robot
11854c2d82 Merge "Updating CDDL schemas to match the finalized spec." 2021-06-18 14:32:25 +00:00