Commit Graph

28122 Commits

Author SHA1 Message Date
Paul Crowley
08e40ff4cc Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690

Change-Id: Ica0fbedf8332f3af13ee78c9275e01c4108ee1e0
2021-04-30 21:13:48 +00:00
Paul Crowley
8b25958b75 Merge "Add getKeyCharacteristics method to KeyMint" 2021-04-30 21:06:14 +00:00
Andy Hung
0b58fe1496 Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146

Change-Id: Iab845c4dacfda0ad2cf7ee09f5ba11cb27bdad8c
2021-04-30 20:52:45 +00:00
Andy Hung
a21b9b5d4e audio: Add device constants for HDMI EARC am: 1f90e1fbf8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703

Change-Id: I6864929c56bfa777773e1388e75a68e2f30b7a68
2021-04-30 20:52:06 +00:00
Andy Hung
24556f0dfe Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125

Change-Id: Iaf2ae912dbae320ebaa8953b9fee0c8d2bae31f9
2021-04-30 20:51:24 +00:00
Andy Hung
b76d8e27fb Merge changes from topics "dra", "dts_uhd", "earc"
* changes:
  Audio: Add AUDIO_FORMAT_DRA
  audio: Add device constants for HDMI EARC
  Audio: Add AUDIO_FORMAT_DTS_UHD
2021-04-30 20:29:48 +00:00
Paul Crowley
dadb18dd29 Add getKeyCharacteristics method to KeyMint
(cherry picked from commit 402d62f7be)

Bug: 186685601
Test: Treehugger
Merged-In: Ie72d865a37e2b6834fe6a86bf843d30286384aa5
Change-Id: Ie72d865a37e2b6834fe6a86bf843d30286384aa5
2021-04-30 10:58:31 -07:00
David Drysdale
fac02e6354 Merge "Test for patchlevels and too much entropy" am: b5ee70f125
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208

Change-Id: I94118fa43ccaf13d87908c37eefc38a1171d8569
2021-04-30 16:44:28 +00:00
David Drysdale
b5ee70f125 Merge "Test for patchlevels and too much entropy" 2021-04-30 16:38:38 +00:00
Treehugger Robot
232fe7792f Merge "Add more symmetric KeyMint tests" am: 3b2b180a29
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103

Change-Id: Ib3b45cf827c4eb98c008187207febe1994ba7dba
2021-04-30 16:38:15 +00:00
Amy Zhang
19746b1629 Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329

Change-Id: I45d9552ba11342b78813375cf39fd2b79df45217
2021-04-30 16:37:32 +00:00
Treehugger Robot
3b2b180a29 Merge "Add more symmetric KeyMint tests" 2021-04-30 16:30:49 +00:00
Amy Zhang
ddafbe597c Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" 2021-04-30 16:21:57 +00:00
David Drysdale
0951649aaf Merge "KeyMint AIDL tweaks" am: 07045b7e83
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102

Change-Id: If28d092cc322392b118e5b9cf9de968b8432cc80
2021-04-30 14:58:40 +00:00
David Drysdale
07045b7e83 Merge "KeyMint AIDL tweaks" 2021-04-30 14:44:35 +00:00
David Drysdale
bb3d85eaa4 Test for patchlevels and too much entropy
Add tests for:
 - Too much entropy should be rejected with INVALID_INPUT_LENGTH
 - All authorization lists should include a vendor and boot patchlevel.

These requirements are in both the KeyMint and the KeyMaster 4.0 AIDL
specificications, but have never been policed before.

Currently disabled with a command-line flag because CF does not have
the patchlevels and so fails lots of tests.

Test: VtsKeyMintAidlTargetTest
Change-Id: Ic9622ef3f1b80e013a34059218e3e029f392eb72
2021-04-30 14:50:14 +01:00
David Drysdale
7de9febd17 Add more symmetric KeyMint tests
Also fix some test name comments along the way.

Test: VtsKeyMintAidlTargetTest
Change-Id: I828acfaa676e1b9fa2e3c6f184f9dafb936b0e82
2021-04-30 14:50:12 +01:00
David Drysdale
40eb8f53ea KeyMint AIDL tweaks
- Describe 3DES requirements
- Remove references to non-existent getKeyCharacteristics() entrypoint
- Remove references to non-existent attestKey() entrypoint
- Remove mention of asymmetric verification operations
- Remove text describing incomplete update()
- Remove text discussing padding for ECDSA
- EC keys can't encrypt/decrypt
- Force use of curve not key size for EC keys
- Drop TODO re: CBOR encoding of wrapped key
- Indicate caller-provided nonces must have correct size
- Add more reference to IKeyMintOperation
- Align parameter names with signatures
- Correct MIN_MAC_LENGTH error code
- Make CREATION_DATETIME consistently optional
- Describe use of MGF1 digest option
- Fix typos

Test: VtsKeyMintAidlTargetTest (CF)
Change-Id: Ie01b99d33be7336e872bf24a7761a3ac5b1d584c
2021-04-30 14:19:31 +01:00
Andy Hung
6ce19700eb Audio: Add AUDIO_FORMAT_DRA
China DTMB digital TV.
See SJ/T11368-2006
“Specification for multichannel digital audio coding technology”.

Test: atest AudioFormatTest
Bug: 185950819
Merged-In: I941c4991e598e864babfb888a8827d1625d95990
Change-Id: I941c4991e598e864babfb888a8827d1625d95990
2021-04-29 19:07:10 -07:00
Andy Hung
1f90e1fbf8 audio: Add device constants for HDMI EARC
Implementation check by grep -E -r  "HDMI_ARC|HDMI_EARC" .

Test: atest AudioDeviceInfoTest
Bug: 131385398
Bug: 151781316
Merged-In: Idfe27b468a9f09770a31b6b58d83de77bebc6c80
Change-Id: Idfe27b468a9f09770a31b6b58d83de77bebc6c80
2021-04-29 18:49:43 -07:00
Andy Hung
3c5fcc51f5 Audio: Add AUDIO_FORMAT_DTS_UHD
See ETSI TS 103 491 V1.2.1 (2019-05)
DTS-UHD Audio Format; Delivery of Channels,
Objects and Ambisonic Sound Fields

Test: atest AudioFormatTest
Bug: 184538197
Merged-In: I4123efb29a95a599982af85068f8e4468ff15159
Change-Id: I4123efb29a95a599982af85068f8e4468ff15159
2021-04-29 17:55:16 -07:00
Amy Zhang
63f4175b6e Allow users to switch between FE source and DVR source when testing
record/descrambling/broadcast

Test: atest VtsHalTvTunerV1_0TargetTest
Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 182519645
CTS-Coverage-Bug: 184077478
Change-Id: I6c57657ac3539d6a6fb3f63d2ecc9af7f6b9e2dc
Merged-In: I6c57657ac3539d6a6fb3f63d2ecc9af7f6b9e2dc
2021-04-28 20:25:36 -07:00
Steven Moreland
7cfbe2e8df Merge "Freeze HALs for Android S" am: 2668e4bc46
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688789

Change-Id: I9422403b654dd2e33842be93097703d56da00f1a
2021-04-28 18:08:00 +00:00
Steven Moreland
2668e4bc46 Merge "Freeze HALs for Android S" 2021-04-28 17:28:42 +00:00
Jooyung Han
b3c0ff4dbf Merge "aidl: Suppress warnings on out-array" am: b4be35f854
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1687505

Change-Id: Icfad71ebf7c28b0546c282c637fec13bc120b62b
2021-04-27 23:10:51 +00:00
Jooyung Han
5235704ac4 Merge changes from topic "fix-aidl-warnings" am: a886a5c4be
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688165

Change-Id: I9d3dadf3247491b7c1edf100d1fbd7e8fc0790a9
2021-04-27 23:09:53 +00:00
Jooyung Han
b4be35f854 Merge "aidl: Suppress warnings on out-array" 2021-04-27 22:47:15 +00:00
Jooyung Han
a886a5c4be Merge changes from topic "fix-aidl-warnings"
* changes:
  aidl: Set explicit default values
  aidl: Set explicit default values
  aidl: Set explicit default values for enum-type fields
  aidl: Set explicit defaults to enum-type fields
2021-04-27 22:46:40 +00:00
Treehugger Robot
409dfb7fbd Merge "Add attestation format documentation" am: af3b58e35a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1664840

Change-Id: Ib8e62affa7440a5ce22a65efd64375153b9da9aa
2021-04-27 21:00:09 +00:00
Treehugger Robot
af3b58e35a Merge "Add attestation format documentation" 2021-04-27 20:40:50 +00:00
Steven Moreland
d116916ba2 Freeze HALs for Android S
Bug: 178221726
Test: none
Change-Id: If18355915c40e8d47c721c1e373efb95db4dcdfa
Merged-In: I77ee02664242827d9aa96c985764cfc109c52b84
2021-04-27 18:18:03 +00:00
David Drysdale
63bd1b149b Merge "Align KeyMint AIDL with usage" am: 5cde787c9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1679847

Change-Id: I7ee783a56e6c76e8d9e3b52bb52b9e22e80682c6
2021-04-27 17:12:14 +00:00
David Drysdale
5cde787c9f Merge "Align KeyMint AIDL with usage" 2021-04-27 16:43:01 +00:00
Shawn Willden
3cb64a6822 Add attestation format documentation
Somehow the attestation format docs got dropped from KeyMint in the
transition from Keymaster.  This replaces them, and also clarifies
that KeyMint StrongBox should not support device attestation.

Test: VtsAidlKeyMintTargetTest
Change-Id: I2334e99b4797c7a0e2e59727ffa730cf7504df31
2021-04-27 09:22:25 -06:00
Jooyung Han
386e55b616 aidl: Set explicit default values
Fixes: 179853698
Test: mma in hardware/interfaces/vibrator
Change-Id: I231c3cfb17f812944bcc6a88e618d96d7068f6c2
2021-04-27 20:11:54 +09:00
Jooyung Han
9c3ebfc83f aidl: Set explicit default values
This fixes warnings in AIDL files(-Wenum-explicit-default).

No semantic changes. (Explicit values are all zero enumerators.)

Fixes: 179853367
Test: mma in hardware/interfaces/keymaster
Change-Id: If5a70da3efd05a344c39ef1d2e73b7ec2b894f33
2021-04-27 18:33:17 +09:00
Jooyung Han
3a966323ef aidl: Set explicit default values for enum-type fields
Fixes: 179853674
Test: mma in hardware/interfaces/neuralnetworks
Change-Id: I9fdc7089eaf1202299da098220875ef8398667fe
2021-04-27 13:58:46 +09:00
Jooyung Han
695ef7acfe aidl: Set explicit defaults to enum-type fields
Fixes: 179853398
Test: mma in hardware/interfaces/graphics
Change-Id: I6f93bca4ba3c8d538765fc9a811b9050c6142cc3
2021-04-27 12:17:39 +09:00
Jooyung Han
d63cd3fff6 aidl: Suppress warnings on out-array
out-param arrays are considered harmful since the Java backend requires
them to be correctly allocated at caller site. But the only user of
android.hardware.identity is in C++, we can just ignore them.

Fixes: 179853403
Test: mma in hardware/interfaces/identity
Change-Id: Ib9b7ad895b3827c0888869a5b154696e3aff5624
2021-04-27 10:51:57 +09:00
Ady Abraham
e8bc48b777 composer: VtsDisplay::setDimensions shouldn't be const am: 2fff170562
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1686815

Change-Id: I7f7a949e8b1474c88d927002c3ef1e6bab671a3e
2021-04-26 20:49:44 +00:00
Ady Abraham
2fff170562 composer: VtsDisplay::setDimensions shouldn't be const
Fix the usage of const attribute in VtsDisplay

Test: run composer 2.4 VTS
Bug: 185195256
Change-Id: I616ea044f46bc080ad0e82753b5031d9a38369f3
2021-04-26 12:00:06 -07:00
Andy Dyer-smith
d6537b480a Merge "Fix typo in PAD_V2 comments" am: e1dd0085d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1682425

Change-Id: Iee7eb1a06620aba8ed940d2c8d10c302f0005b4e
2021-04-26 18:59:55 +00:00
Andy Dyer-smith
e1dd0085d9 Merge "Fix typo in PAD_V2 comments" 2021-04-26 17:48:17 +00:00
Selene Huang
995962e9dd Added various vts tests for attestKey. am: 8f9494c4f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1683913

Change-Id: Iab558b9eafd345d42dce320cb59e2b65a207c95c
2021-04-26 12:32:02 +00:00
Selene Huang
8f9494c4f6 Added various vts tests for attestKey.
- Added tests for signing attest key with factory chain.
  - Added test for signing encryption keys.
  - Added tests for chaining many RSA attest keys on the same chain.
  - Added tests for chaining many Ec attest keys on the same chain.
  - Added tests for alternate chaining of rsa-ec-rsa-ec-rsa attesti
    keys on the same chain.

Test: atest VtsAidlKeyMintTargetTest
Change-Id: I9c67e2b928d6bba6cc4074a4b65f639f33c9ec26
2021-04-24 22:43:13 -07:00
Treehugger Robot
dac4637fcf Merge "Bluetooth: Turn Bluetooth off while device setup" am: 24c422c48b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1685385

Change-Id: I0535c6cae1f0c070df839789deb7e120746861ef
2021-04-23 18:04:46 +00:00
Treehugger Robot
24c422c48b Merge "Bluetooth: Turn Bluetooth off while device setup" 2021-04-23 17:46:53 +00:00
Andy Dyer-Smith
889c46c11a Fix typo in PAD_V2 comments
Bug: 158315823
Test: m

Change-Id: Ic7ba213f2e0ff523349e4b80926a302399db8d88
2021-04-23 16:25:12 +00:00
Treehugger Robot
46fe94ee88 Merge "Added vts tests for certificate subject and serial for various algorithms and self sign or non-self sign certificates." am: f04466c090
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1682337

Change-Id: I0fb2dab83f68beff426ab6fcf6ab6b5348c6d349
2021-04-23 08:09:05 +00:00
Treehugger Robot
f04466c090 Merge "Added vts tests for certificate subject and serial for various algorithms and self sign or non-self sign certificates." 2021-04-23 07:53:20 +00:00