Mikhail Naganov
2df535ab12
[automerger skipped] audio HAL - fix UAFs am: bd78085f08
-s ours am: 358f0174a5
-s ours am: d1a8e6c2ab
-s ours am: f95892e056
-s ours am: 693ef009de
-s ours am: 80a32475e3
-s ours
...
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14214258
Change-Id: If49a26f3000863644d0e91b94c357c67416b1a7c
2021-07-13 22:29:29 +00:00
Edwin Wong
0916c1b8b2
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f
-s ours am: 583a32b6c4
-s ours am: 79754b8dbb
-s ours am: ea107f75ac
-s ours am: ea7913adf1
-s ours am: 814a34003d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596
Change-Id: I306dbee8ccfd47f98b6526766bf62913d4d627c2
2021-07-13 22:29:21 +00:00
Edwin Wong
9584ef12b8
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4
-s ours am: 2d3819de76
-s ours am: 08cc801065
-s ours am: 0d39675734
-s ours am: a19de5a59f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499307
Change-Id: Ieb6330c5f09071bea940beeeed758f98da9514c9
2021-07-13 22:29:13 +00:00
Edwin Wong
06d20864f4
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14
-s ours am: ef66293e9a
-s ours am: 932ee80a22
-s ours am: a6825483b4
-s ours am: cee994fd5c
-s ours am: 402a0d9e6d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13462326
Change-Id: Id2cee1cbb5e2a3596271ed965dcc9c4bf2ed0d31
2021-07-13 22:28:49 +00:00
Edwin Wong
0e85ec7532
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835
-s ours am: e17031023f
-s ours am: bc0c22c343
-s ours am: 6c942475ba
-s ours am: 2bbbc56712
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13459668
Change-Id: I04de5a53d392d688aae439279ff3800c9c605dbc
2021-07-13 22:28:41 +00:00
Mikhail Naganov
80a32475e3
[automerger skipped] audio HAL - fix UAFs am: bd78085f08
-s ours am: 358f0174a5
-s ours am: d1a8e6c2ab
-s ours am: f95892e056
-s ours am: 693ef009de
-s ours
...
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14214258
Change-Id: Ic4e39cfb299f653ac37bbada7b4f284f5d0f6034
2021-07-13 22:17:47 +00:00
Edwin Wong
814a34003d
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f
-s ours am: 583a32b6c4
-s ours am: 79754b8dbb
-s ours am: ea107f75ac
-s ours am: ea7913adf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596
Change-Id: I0f9fbedca9cc7ae0cb193dd798f48c04a1389a06
2021-07-13 22:17:42 +00:00
Edwin Wong
a19de5a59f
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4
-s ours am: 2d3819de76
-s ours am: 08cc801065
-s ours am: 0d39675734
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499307
Change-Id: I2a3c37b73625134c1bbbcfb5b624420b28b8f25f
2021-07-13 22:17:34 +00:00
Edwin Wong
402a0d9e6d
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14
-s ours am: ef66293e9a
-s ours am: 932ee80a22
-s ours am: a6825483b4
-s ours am: cee994fd5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13462326
Change-Id: Idfa77d751bbbb184033a37897c2bc1cc971757c7
2021-07-13 22:17:15 +00:00
Edwin Wong
2bbbc56712
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835
-s ours am: e17031023f
-s ours am: bc0c22c343
-s ours am: 6c942475ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13459668
Change-Id: I6de7dc34d951e5d6b05dc77757d5911a64ba88d4
2021-07-13 22:17:08 +00:00
Mikhail Naganov
693ef009de
[automerger skipped] audio HAL - fix UAFs am: bd78085f08
-s ours am: 358f0174a5
-s ours am: d1a8e6c2ab
-s ours am: f95892e056
-s ours
...
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14214258
Change-Id: Ibb4ce9d31f77a0c787396769efcc52b195598f76
2021-07-13 22:03:57 +00:00
Edwin Wong
ea7913adf1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f
-s ours am: 583a32b6c4
-s ours am: 79754b8dbb
-s ours am: ea107f75ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596
Change-Id: Ife7e2496a5b8fb42e3e1edcf1734572c8a94573b
2021-07-13 22:03:50 +00:00
Edwin Wong
0d39675734
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4
-s ours am: 2d3819de76
-s ours am: 08cc801065
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499307
Change-Id: Ie69da8eddaaee528add1003c69d2e6806923567f
2021-07-13 22:03:42 +00:00
Edwin Wong
cee994fd5c
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14
-s ours am: ef66293e9a
-s ours am: 932ee80a22
-s ours am: a6825483b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13462326
Change-Id: Ia6a41288cfe5fd004d1e2439a73baaf6f97cb993
2021-07-13 22:03:21 +00:00
Edwin Wong
6c942475ba
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835
-s ours am: e17031023f
-s ours am: bc0c22c343
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13459668
Change-Id: I481b343e5889cddc535c36a28c310f35e2cd4a89
2021-07-13 22:03:13 +00:00
Mikhail Naganov
f95892e056
[automerger skipped] audio HAL - fix UAFs am: bd78085f08
-s ours am: 358f0174a5
-s ours am: d1a8e6c2ab
-s ours
...
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14214258
Change-Id: I154915eabab0171687bd1e36834c5183e59f2500
2021-07-13 21:45:22 +00:00
Edwin Wong
ea107f75ac
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f
-s ours am: 583a32b6c4
-s ours am: 79754b8dbb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596
Change-Id: I5e4b4ad6b8013ff2bfe5866c080a7949f06466ce
2021-07-13 21:45:18 +00:00
Edwin Wong
08cc801065
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4
-s ours am: 2d3819de76
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499307
Change-Id: I0bd1a89ca80696ccbe951b8c61d95d62fd2e82bb
2021-07-13 21:45:12 +00:00
Edwin Wong
a6825483b4
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14
-s ours am: ef66293e9a
-s ours am: 932ee80a22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13462326
Change-Id: Id6800bbc7f642a91456368601afa0ddc3270d342
2021-07-13 21:44:59 +00:00
Edwin Wong
bc0c22c343
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835
-s ours am: e17031023f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13459668
Change-Id: I957226dd902bd82def0d6498abc1cf5e5c5818dd
2021-07-13 21:44:50 +00:00
Mikhail Naganov
d1a8e6c2ab
[automerger skipped] audio HAL - fix UAFs am: bd78085f08
-s ours am: 358f0174a5
-s ours
...
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14214258
Change-Id: Iee0d7f34fb8759f194b4057c409b612e61349572
2021-07-13 21:29:02 +00:00
Edwin Wong
79754b8dbb
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into oc-mr1-dev am: c73a52277f
-s ours am: 583a32b6c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13497596
Change-Id: I329f92aac86f973e06d6dc708bad7eb68091d0b0
2021-07-13 21:28:58 +00:00
Edwin Wong
2d3819de76
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: ae1c624ba4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499307
Change-Id: Ibc9ffef15dcc042b09ffbe4802924f5513956acb
2021-07-13 21:28:53 +00:00
Edwin Wong
932ee80a22
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: d468101f14
-s ours am: ef66293e9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13462326
Change-Id: Ibce2a4324aa2340ca19ddb1297e1e99ef6b50416
2021-07-13 21:28:38 +00:00
Edwin Wong
e17031023f
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow." into pi-dev am: 0dc3f03835
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13459668
Change-Id: I60aafc1050107127e9bf481268f43fe5725ce97f
2021-07-13 21:28:31 +00:00
TreeHugger Robot
eca569897a
Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing" into sc-dev
2021-07-13 17:35:10 +00:00
TreeHugger Robot
f58618f851
Merge "KeyMint: Fix device-unique attestation chain specification" into sc-dev
2021-07-13 15:24:53 +00:00
Seth Moore
3dbdaa9717
Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing
...
The TAG_ALLOW_WHILE_ON_BODY authorization is not required to be
supported, and if it is not supported it's a noop. Don't expect the tag
to fail with UNSUPPORTED_TAG on devices that don't support it.
Test: VtsAidlKeyMintTargetTest
Bug: 192222727
Change-Id: I2e80ca59151e79f595a65cae94ac966b4ba7020d
2021-07-12 15:10:40 -07:00
Oscar Shu
45cb33bf7a
Merge "Clear ringbuffer after dumping to file" into sc-dev
2021-07-12 16:48:43 +00:00
xshu
c905ea66d4
Clear ringbuffer after dumping to file
...
Clear the in-memory ringbuffer after writing to file.
Bug: 193007899
Test: Manually verified ringbuffers are cleared with command "adb shell
lshal debug android.hardware.wifi@1.5::IWifi"
Change-Id: Icfa08634e948d7155e231458edd394a4d699fbaa
2021-07-11 22:39:29 -07:00
Alec Mouri
f569528b19
Merge "Clear composition changes when a color mode is not supported" into sc-dev
2021-07-09 21:18:30 +00:00
Alec Mouri
b1bd1e8a32
Clear composition changes when a color mode is not supported
...
Otherwise this may cause a test to spuriously fail during teardown.
Bug: 184726169
Test: VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I569680a0fe6c866199ba0711e8cc263b9b3efd58
2021-07-09 11:15:18 -07:00
Seth Moore
87eb1dd928
Update KeyMint VTS tests with prod GEEK
...
Now that we have the production Google Endpoint Encryption Key, we can
update the tests to use the correct GEEK cert chain where applicable.
Ignore-AOSP-First: No merge path to aosp, will manually merge
Test: VtsHalRemotelyProvisionedComponentTargetTest
Test: VtsAidlKeyMintTargetTest
Bug: 191301285
Change-Id: I84b557c6bad34741ffe6671fc941d9e266b73241
2021-07-09 08:47:54 -07:00
Eran Messeri
3e6c2ef9c8
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
Merged-In: I6e6bca33ebb4af67cac8e41a39e9c305d0f1345f
Change-Id: Iebefafe72148c919d10308eff7a19fc1bc40c619
2021-07-09 09:08:17 +01:00
Seth Moore
e35b1427e6
Merge "Add Attestation IDs State to DeviceInfo" into sc-dev
2021-07-08 23:04:37 +00:00
TreeHugger Robot
4987850cc5
Merge "Camera: Add logical camera requirement test for GVF" into sc-dev
2021-07-08 21:43:43 +00:00
Seth Moore
f594fce5dd
Add Attestation IDs State to DeviceInfo
...
We will use the 'Attestation IDs State' field in DeviceInfo to
determine whether a device is still provisionable or not. Once a
production device has left the factory, certain attestated device ids
should be fixed, and 'Attestation IDs State' should reflect this
by reporting "locked".
Remove stale, duplicated DeviceInfo description from ProtectedData.aidl
Test: None, just a doc change
Bug: 192017485
Change-Id: I4e0a840a8f415b3b410801805a158c46be30ec6a
2021-07-08 12:47:42 -07:00
TreeHugger Robot
bca91a0fde
Merge "Camera: Fix a typo in the 3.7 device comment" into sc-dev
2021-07-08 18:30:51 +00:00
Shuzhen Wang
3ed299dfca
Camera: Add logical camera requirement test for GVF
...
The test verifies that if more than one color camera is available for a
particular facing, a logical mulit-camera must be supported consisting
all color cameras facing that direction.
Test: Run VTS test on Pixel4 and cuttlefish emulator
Bug: 178633246
Change-Id: I7b02a4057064a7f4a236c1bbc49f768ac80232cf
2021-07-08 11:03:24 -07:00
TreeHugger Robot
1e3ab5940f
Merge "Add test ensuring that BCC keys not unique ids" into sc-dev
2021-07-08 17:15:27 +00:00
TreeHugger Robot
3456ce6816
Merge "audio: Fix handling of relative XML include paths in VTS" into sc-dev
2021-07-08 16:31:37 +00:00
Seth Moore
17587b0183
Add test ensuring that BCC keys not unique ids
...
Get two test BCCs, then ensure that no repeated keys are found.
Ignore-AOSP-First: No merge path to AOSP, will manually port.
Bug: 192687735
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I48f86e7dfa9ab4bc6303a8d1b64ac7ca6ac76bbf
2021-07-08 15:54:52 +00:00
TreeHugger Robot
acce5d3c68
Merge "Use TagType constants" into sc-dev
2021-07-08 15:32:25 +00:00
Eran Messeri
befeda6b00
Use TagType constants
...
Now that the aidl compiler supports it, use constants from TagType to
indicate the type of each tag, rather than duplicating the values of
the constants.
Test: atest VtsAidlKeyMintTargetTest
Bug: 183737811
Merged-In: Ie8af1f00d04fa05c59cfc72692caecbcf2fae483
Change-Id: Ie62b6ee8a8ced05a870711073bb3be16931f3d4d
2021-07-08 10:45:10 +01:00
Eran Messeri
12ee28322d
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: I98b96cc8c49eb339a998d0abed9216aa57f6b19f
Merged-In: I80ccaedeb777fdb249a8cb021db6628da32d6029
2021-07-08 10:42:13 +01:00
Mikhail Naganov
13c6796528
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
2021-07-07 21:08:42 +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
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
046020b149
IFace: update VTS tests
...
Bug: 170650876
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: I0b38a98acaec654b144dbe56fc64c5c741bd4488
2021-07-03 00:10:19 +00:00