Shawn Willden
c282b3bd75
Merge "AttestationKey documentation" am: c46f9da49f am: 5df02652c1 am: 237ecec162 am: ff9fce151e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665
Change-Id: I86218de365fa0bd33880b8724e00b6f46cd72182
2021-05-03 16:17:05 +00:00
Shawn Willden
ff9fce151e
Merge "AttestationKey documentation" am: c46f9da49f am: 5df02652c1 am: 237ecec162
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665
Change-Id: Ia88c1b7c7fca3e2e7faec983e72327f3305f0e82
2021-05-03 16:03:50 +00:00
Shawn Willden
237ecec162
Merge "AttestationKey documentation" am: c46f9da49f am: 5df02652c1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665
Change-Id: Ib101ab91f951977138ea019d449440439cfccce5
2021-05-03 15:48:56 +00:00
Shawn Willden
5df02652c1
Merge "AttestationKey documentation" am: c46f9da49f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665
Change-Id: Icaf7e68d2ee5871dda88a7615cebd6bee7e71d00
2021-05-03 15:32:18 +00:00
Shawn Willden
c46f9da49f
Merge "AttestationKey documentation"
2021-05-03 15:07:38 +00:00
Alisher Alikhodjaev
93a284eaa7
Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7 am: 57fc648599 am: 8716375c32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915
Change-Id: Ie63e5559a319fefbbe33b37b987c1806f6d5153c
2021-05-01 00:49:49 +00:00
Alisher Alikhodjaev
8716375c32
Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7 am: 57fc648599
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915
Change-Id: I6d2c0b11106e4d6f461edcf7b11a08889af7bfcc
2021-05-01 00:31:41 +00:00
Alisher Alikhodjaev
57fc648599
Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915
Change-Id: I0027d2ed9350a1dd159a922e5922ae63449eceb9
2021-05-01 00:15:12 +00:00
Alisher Alikhodjaev
14162741e7
Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev
2021-04-30 23:55:46 +00:00
Paul Crowley
fb51db3535
[automerger skipped] Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc am: c45edf9eb4 am: b7d7e97f49 -s ours
...
am skip reason: Merged-In Ie72d865a37e2b6834fe6a86bf843d30286384aa5 with SHA-1 402d62f7be is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690
Change-Id: Ib87b8cfac08a098feb40434ea7de9197bee1ccb3
2021-04-30 22:17:33 +00:00
Andy Hung
a86a9fa16b
[automerger skipped] Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb am: 0b58fe1496 am: dd1756f22b -s ours am: d711c2c411 -s ours
...
am skip reason: Merged-In I941c4991e598e864babfb888a8827d1625d95990 with SHA-1 9072e5f0db is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146
Change-Id: I6fcbca2b83e3aaab675f2ae75cf934dd1d816fdc
2021-04-30 22:16:44 +00:00
Andy Hung
831eefd49c
[automerger skipped] audio: Add device constants for HDMI EARC am: 1f90e1fbf8 am: a21b9b5d4e am: ebb8be17c4 -s ours am: 82e3d3bf49 -s ours
...
am skip reason: Merged-In Idfe27b468a9f09770a31b6b58d83de77bebc6c80 with SHA-1 4da4945039 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703
Change-Id: I2dbaafa244eae592b5131df8b95a11bfb4130b09
2021-04-30 22:16:43 +00:00
Andy Hung
713655adec
[automerger skipped] Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe am: 6edb870022 -s ours am: 82a7f614c0 -s ours
...
am skip reason: Merged-In I4123efb29a95a599982af85068f8e4468ff15159 with SHA-1 a468cac258 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125
Change-Id: I67cb7e2cfbed42a6f7bb187cb14afc98d62aeee2
2021-04-30 22:16:42 +00:00
Paul Crowley
b7d7e97f49
Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc am: c45edf9eb4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690
Change-Id: I23db751a9e8448e8e85d35ff9be7199777ab9f6f
2021-04-30 21:54:56 +00:00
Andy Hung
d711c2c411
[automerger skipped] Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb am: 0b58fe1496 am: dd1756f22b -s ours
...
am skip reason: Merged-In I941c4991e598e864babfb888a8827d1625d95990 with SHA-1 9072e5f0db is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146
Change-Id: If39977c0ffcf05b5150a65e4757901b79dab4b3c
2021-04-30 21:53:21 +00:00
Andy Hung
82e3d3bf49
[automerger skipped] audio: Add device constants for HDMI EARC am: 1f90e1fbf8 am: a21b9b5d4e am: ebb8be17c4 -s ours
...
am skip reason: Merged-In Idfe27b468a9f09770a31b6b58d83de77bebc6c80 with SHA-1 4da4945039 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703
Change-Id: Iadeb49045dc08a5e6a8d77de3a5659d3ee118ea0
2021-04-30 21:53:20 +00:00
Andy Hung
82a7f614c0
[automerger skipped] Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe am: 6edb870022 -s ours
...
am skip reason: Merged-In I4123efb29a95a599982af85068f8e4468ff15159 with SHA-1 a468cac258 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125
Change-Id: I71c61f554d5149531f4d183ce7dbf140df490930
2021-04-30 21:53:18 +00:00
Paul Crowley
c45edf9eb4
Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690
Change-Id: If3f6752a1b7fa175f8bd4d882974e005fc3fe41c
2021-04-30 21:35:45 +00:00
Andy Hung
dd1756f22b
Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb am: 0b58fe1496
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146
Change-Id: Ia8f84c5c03dbf91fafc822ce2b1ef8480f104b7d
2021-04-30 21:28:36 +00:00
Andy Hung
ebb8be17c4
audio: Add device constants for HDMI EARC am: 1f90e1fbf8 am: a21b9b5d4e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703
Change-Id: I3b2bc500ca14d75ba1d0a6cc04ae6dc8784ae241
2021-04-30 21:28:35 +00:00
Andy Hung
6edb870022
Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125
Change-Id: Iee1f48feeb4e067daef3e46a94145c60a34a33af
2021-04-30 21:28:33 +00:00
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
Paul Crowley
ac43bb889a
Merge "Add getKeyCharacteristics method to KeyMint"
2021-04-30 17:53:08 +00:00
David Drysdale
7cb5a8a59e
Merge "Test for patchlevels and too much entropy" am: b5ee70f125 am: fac02e6354 am: e89f9b8e30 am: 8f7c7527a4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208
Change-Id: Id1965f751b9491efe5b15ae2b8fd2c1266a7dc33
2021-04-30 17:45:28 +00:00
Treehugger Robot
dfc8d6c857
Merge "Add more symmetric KeyMint tests" am: 3b2b180a29 am: 232fe7792f am: 6ac16ced07 am: 589b62379f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103
Change-Id: If330e4d02e0417b86b5be6527b6bb240494c7682
2021-04-30 17:45:17 +00:00
Amy Zhang
371f986c13
[automerger skipped] Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629 am: fdeac2b2aa -s ours am: d5e3efe6b2 -s ours
...
am skip reason: Merged-In I6c57657ac3539d6a6fb3f63d2ecc9af7f6b9e2dc with SHA-1 160a72c9e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329
Change-Id: Iac0304a97d197f485454535d702a0817c2aa745b
2021-04-30 17:44:43 +00:00
David Drysdale
8f7c7527a4
Merge "Test for patchlevels and too much entropy" am: b5ee70f125 am: fac02e6354 am: e89f9b8e30
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208
Change-Id: I84c7c86292b8b529c5dc261cdf7b8f2b72e61930
2021-04-30 17:31:56 +00:00
Treehugger Robot
589b62379f
Merge "Add more symmetric KeyMint tests" am: 3b2b180a29 am: 232fe7792f am: 6ac16ced07
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103
Change-Id: I437b4140aa3f43f20c7aca41c26d26e47cfeda1c
2021-04-30 17:31:52 +00:00
Amy Zhang
d5e3efe6b2
[automerger skipped] Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629 am: fdeac2b2aa -s ours
...
am skip reason: Merged-In I6c57657ac3539d6a6fb3f63d2ecc9af7f6b9e2dc with SHA-1 160a72c9e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329
Change-Id: Id442047e62940b40db458a4ea362f8635b5f8ace
2021-04-30 17:31:39 +00:00
David Drysdale
e89f9b8e30
Merge "Test for patchlevels and too much entropy" am: b5ee70f125 am: fac02e6354
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208
Change-Id: I94218d8a6f289a646b8f0fdc637282365f1e2f6a
2021-04-30 17:00:30 +00:00
Treehugger Robot
6ac16ced07
Merge "Add more symmetric KeyMint tests" am: 3b2b180a29 am: 232fe7792f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103
Change-Id: I73ba552a6365e6a0807019ce4d54a3e36e079e81
2021-04-30 17:00:18 +00:00
Amy Zhang
fdeac2b2aa
Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329
Change-Id: I433eb641c0e0b97874494a7a993076c31a0d7497
2021-04-30 17:00:07 +00: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
50c3e42ed2
Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf am: 7958c3128f am: 180ffd4bc0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102
Change-Id: Ib0750e642418b7456328e969a69f1ce8702b2a68
2021-04-30 15:49:57 +00:00
David Drysdale
180ffd4bc0
Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf am: 7958c3128f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102
Change-Id: I3d46ef7453a359a739303c95b4076069a3e96b45
2021-04-30 15:36:53 +00:00
David Drysdale
7958c3128f
Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102
Change-Id: I0f32ef2d43046e70e478d7fdea130d7f354f5bd0
2021-04-30 15:20:31 +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