Commit Graph

22875 Commits

Author SHA1 Message Date
Midas Chien
081dec5496 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev am: ac4ee96268 am: 8c79371377
Original change: undetermined

Change-Id: I82727d687f64f9ba35605763fa26ca87d6c053fd
2020-06-02 17:16:52 +00:00
Midas Chien
8ed6b58680 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev am: ac4ee96268 am: e01dd849b6
Original change: undetermined

Change-Id: Iaf2ac21883d6661dc925d2b4fbe2b4a74ddd8b32
2020-06-02 17:16:25 +00:00
Midas Chien
8c79371377 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev am: ac4ee96268
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11631145

Change-Id: Ie92e8d7df9f0622c5f4fa23b0244ba433cc55e54
2020-06-02 16:57:19 +00:00
Midas Chien
e01dd849b6 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev am: ac4ee96268
Original change: undetermined

Change-Id: If93e963db13577f8171320d5c95a40bc37c1e9db
2020-06-02 16:57:13 +00:00
TreeHugger Robot
a9ca8aae73 Merge "Disable framework for some VTS tests" into rvc-dev am: 615e726ebc am: e724855ce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11666719

Change-Id: I221d26d58c9e090700704b8083b594925ec90fa0
2020-06-02 16:52:31 +00:00
TreeHugger Robot
3443325d6d Merge "Disable framework for some VTS tests" into rvc-dev am: 615e726ebc am: 2306ac264f
Original change: undetermined

Change-Id: Icd25e356ceeb598435e133e4c32000f1dd3223ec
2020-06-02 16:52:01 +00:00
Midas Chien
ac4ee96268 Merge "composer: vts: send refresh frame even composition changes" into rvc-dev 2020-06-02 16:47:55 +00:00
TreeHugger Robot
e724855ce7 Merge "Disable framework for some VTS tests" into rvc-dev am: 615e726ebc
Original change: undetermined

Change-Id: I7d72fe8e87aeee60b5527684c9636e7681d693e3
2020-06-02 16:39:41 +00:00
TreeHugger Robot
2306ac264f Merge "Disable framework for some VTS tests" into rvc-dev am: 615e726ebc
Original change: undetermined

Change-Id: If63717d2790ca018909d5be70d6f8c5806e3e69c
2020-06-02 16:39:31 +00:00
TreeHugger Robot
615e726ebc Merge "Disable framework for some VTS tests" into rvc-dev 2020-06-02 16:21:46 +00:00
Shawn Willden
d56a9c3b63 [automerger skipped] Fix delivery of earlyBootEnded to KM4.1 am: a2a6a33ea9 am: 5ffa73290d -s ours am: 8883f515b1 -s ours
am skip reason: Change-Id I752b44f5cc20d85bf819188ccaaf0813a5607ba5 with SHA-1 08c7e71236 is in history

Original change: undetermined

Change-Id: Idecdd2ae286b1448bd90688b005dfd5ed536e75d
2020-06-02 04:32:51 +00:00
Shawn Willden
8883f515b1 [automerger skipped] Fix delivery of earlyBootEnded to KM4.1 am: a2a6a33ea9 am: 5ffa73290d -s ours
am skip reason: Change-Id I752b44f5cc20d85bf819188ccaaf0813a5607ba5 with SHA-1 08c7e71236 is in history

Original change: undetermined

Change-Id: I4d28a2a9cb0cb34a42601c7e54857033a6159025
2020-06-02 04:19:20 +00:00
Shawn Willden
5ffa73290d Fix delivery of earlyBootEnded to KM4.1 am: a2a6a33ea9
Original change: undetermined

Change-Id: I80dfc835a8d4b92561e090375ea6343c11734bb8
2020-06-02 04:01:17 +00:00
TreeHugger Robot
190fd86742 [automerger skipped] Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev am: d7940ccf2f -s ours am: 0c448001a3 -s ours
am skip reason: skipped by user felipeal

Original change: undetermined

Change-Id: I56a22f1a32284c7db68cdebfaca5dc9c8444a04e
2020-06-02 01:26:56 +00:00
TreeHugger Robot
f9aa2393c1 Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev am: d7940ccf2f am: b2402c7664
Original change: undetermined

Change-Id: I5c8b99b8027b5ec10ace323d872cd85f9a0d4177
2020-06-02 00:54:28 +00:00
TreeHugger Robot
0c448001a3 [automerger skipped] Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev am: d7940ccf2f -s ours
am skip reason: skipped by user felipeal

Original change: undetermined

Change-Id: I3b52b9397ea4be7853efe6fdb4e575a48d298a68
2020-06-02 00:53:02 +00:00
TreeHugger Robot
b2402c7664 Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev am: d7940ccf2f
Original change: undetermined

Change-Id: Ied7f3e3938ce9ee321f9f7907f73d5eaf20b3560
2020-06-02 00:32:14 +00:00
TreeHugger Robot
d7940ccf2f Merge "Implemented CREATE_USER and REMOVE_USER on VHAL reference implementation." into rvc-dev 2020-06-02 00:06:56 +00:00
Jayant Chowdhary
ed66086cb4 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947 am: 46a82de871
Original change: undetermined

Change-Id: I11bd0f3806fcd7dfa8cb3f8b8611248350e6763e
2020-06-01 23:18:46 +00:00
Jayant Chowdhary
db10799329 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947 am: 1487a9ebb3
Original change: undetermined

Change-Id: I7428b76dc741998cd79ec4a457e4c37b0d2521fd
2020-06-01 23:17:24 +00:00
Jayant Chowdhary
46a82de871 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947
Original change: undetermined

Change-Id: I7f99fe08f74082881ecdbe38daa8b21ebbc8dacd
2020-06-01 23:02:55 +00:00
Jayant Chowdhary
1487a9ebb3 Merge changes from topic "vts-secure-only-camera" into rvc-dev am: ec37ce4947
Original change: undetermined

Change-Id: I59590798e81bf9f87ef3d598aa333cb89a13dbbf
2020-06-01 23:02:39 +00:00
Jayant Chowdhary
ec37ce4947 Merge changes from topic "vts-secure-only-camera" into rvc-dev
* changes:
  Camera VTS: Add a minimal test for secure only cameras.
  camera vts: Skip regular vts tests for secure only cameras.
2020-06-01 22:52:53 +00:00
Shawn Willden
a2a6a33ea9 Fix delivery of earlyBootEnded to KM4.1
Bug: 152932559
Test: Boot and observe that Strongbox gets the message
Merged-In: I752b44f5cc20d85bf819188ccaaf0813a5607ba5
Change-Id: I752b44f5cc20d85bf819188ccaaf0813a5607ba5
2020-06-01 14:08:39 -06:00
Jayant Chowdhary
a80974ca8c Camera VTS: Add a minimal test for secure only cameras.
Bug: 156749607

Test: VtsHalCameraProviderV2_4TargetTest
      --gtest_filter=PerInstance/CameraHidlTest.processSecureCaptureRequest* on device which
      SECURE_IMAGE_DATA.

Change-Id: I57f6210b69b383dc4f43cc4ee8272050a0432541
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:15:58 -07:00
Jayant Chowdhary
83b724a23f camera vts: Skip regular vts tests for secure only cameras.
Bug: 156749607

Test: fake mark a camera id as a secure only, see that it doesn't get
      tested unless a test calls getCameraDeviceNames with addSecure = true

Test: VtsHalCameraProviderV2_4TargetTest passes on device without any secure only
      cameras

Change-Id: Ibe428b663bd8024f46f0273ed5dfaa108a90dd43
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-01 12:14:47 -07:00
Orion Hodson
fd5f4b8f74 Merge "Add dependency on jni_headers" am: d2985135d6 am: 28c170427e am: 293821e269
Change-Id: I60bbe02e69aa0aa9eba9d91ac8f83f84256cbea4
2020-06-01 10:14:48 +00:00
Orion Hodson
293821e269 Merge "Add dependency on jni_headers" am: d2985135d6 am: 28c170427e
Change-Id: I71d75eda1c74b7bfb43b243980dfe188094ea6ce
2020-06-01 09:58:44 +00:00
Orion Hodson
28c170427e Merge "Add dependency on jni_headers" am: d2985135d6
Change-Id: Ibd4542573f6cb148141b2834b16178cc09102a0f
2020-06-01 09:39:14 +00:00
Orion Hodson
d2985135d6 Merge "Add dependency on jni_headers" 2020-06-01 09:20:10 +00:00
Bowgo Tsai
ac9d129893 Allow unlocked in VTS am: 43dd6e34bd am: 767b4b3c2a am: 40eb1a490b
Change-Id: Iddd7169bc181f2d0b7df5fe3a786b066b5cc4ccb
2020-06-01 04:36:59 +00:00
Bowgo Tsai
40eb1a490b Allow unlocked in VTS am: 43dd6e34bd am: 767b4b3c2a
Change-Id: Ia559b9083b1ac7960b93f710fc5cb2d5390dfac7
2020-06-01 04:25:02 +00:00
Bowgo Tsai
767b4b3c2a Allow unlocked in VTS am: 43dd6e34bd
Change-Id: I91e5f63351c465aee0f4fe829d2fd4c003cd55f1
2020-06-01 04:03:29 +00:00
Amy Zhang
a57fffe3b9 Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f am: 1635f9e103
Change-Id: Ic3a092a7b218ab1d258834ae473fc918d4ae2aa5
2020-05-30 01:27:31 +00:00
Amy Zhang
31e4144481 Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f am: 484bbd0755
Change-Id: If85c10f75f03cabb50a905457208860170a2ccfe
2020-05-30 01:26:25 +00:00
Amy Zhang
1635f9e103 Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f
Change-Id: I68e9a7c4121379599f61a34fbc345a37f3f1b26b
2020-05-30 01:11:32 +00:00
Amy Zhang
484bbd0755 Merge "Add DescramberTests in Tuner VTS" into rvc-dev am: b035b6a80f
Change-Id: Idcb6603a6d324f5c318a9efa3dfc497eb01a3e93
2020-05-30 01:11:31 +00:00
Amy Zhang
b035b6a80f Merge "Add DescramberTests in Tuner VTS" into rvc-dev 2020-05-30 00:57:29 +00:00
Amy Zhang
fd7c644470 Add DescramberTests in Tuner VTS
Note that this test also includes MediaCasService openSession test
to pass the session id as the key token to the IDescrambler

Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 150987138
Change-Id: Iacd4ad5fcd957a6e3bb4a5730337ecaa3adc0aa2
2020-05-29 16:35:18 -07:00
Dan Shi
b2dd35aaf2 Disable framework for some VTS tests
The test doesn't need framework. It seems that the test can be flaky
when framework was stop/started earlier.

Bug: 154445273
Test: atest -a VtsHalBluetoothV1_0TargetTest \
  VtsHalSapV1_0TargetTest \
  VtsHalAudioV4_0TargetTest

Change-Id: I60f62923cfb826c5e33e9885ea08efdbe4c8f57e
2020-05-29 15:40:38 -07:00
Selene Huang
32d39ed05d [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 57b3479394 -s ours am: 95b475661f -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: I7b883b170c264993a6cf8386ff908b26c568b727
2020-05-29 21:53:46 +00:00
Selene Huang
f592af6543 [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 57b3479394 am: e7aa4b92c5 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: I016b4c7bb76bbd6be31c9047cb56f92d5695ba95
2020-05-29 21:52:32 +00:00
Selene Huang
e7aa4b92c5 Add attestation certificate parsing and validate for IC vts. am: 57b3479394
Change-Id: I631c29be453e4adb079ab28564836952bd292d31
2020-05-29 21:39:20 +00:00
Selene Huang
95b475661f [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 57b3479394 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: Icda771e7c01bd1bc2543ffb7e03ac76aaaa9f78f
2020-05-29 21:39:19 +00:00
Selene Huang
57b3479394 Add attestation certificate parsing and validate for IC vts.
- Added attestation certificate parsing support.
 - Added various certificate conversion support.
 - Added certification verification support.
 - Added tests for the attestation certificate verification.
 - Updated the old tests to use the new attestation validation
   implementation.
 - Updated GenerateReaderCertificate to use pointer reader private key.

Bug: 154909726
Test: VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Merged-In: Ibe770e6eaf0b0018d60876926d824204e4eaf732
Change-Id: I07c2eaf92ed60fa31761816c4b45684806c3305e
2020-05-29 15:50:55 -04:00
Automerger Merge Worker
e3d4a3d95d Merge "[automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3 -s ours am: 29a26add4d -s ours" into rvc-d1-dev-plus-aosp 2020-05-29 17:58:41 +00:00
Selene Huang
e12d1e9ce5 [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3 -s ours am: 29a26add4d -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: Iad6a0eb7ccff76aed0916267cd1711ff49cf15d7
2020-05-29 17:58:37 +00:00
Selene Huang
d4acfe5da7 [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3 am: c7b50fed50 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: I3a41e3c5ed1fac3ba4dc8151d59a9a6a9c3a74db
2020-05-29 17:58:28 +00:00
Selene Huang
29a26add4d [automerger skipped] Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3 -s ours
am skip reason: Change-Id Ibe770e6eaf0b0018d60876926d824204e4eaf732 with SHA-1 cab019aae5 is in history

Change-Id: Ie01a0cb16b925f6224c0c0d5268ee7d366c3038c
2020-05-29 17:39:03 +00:00
Selene Huang
c7b50fed50 Add attestation certificate parsing and validate for IC vts. am: 38ca6961e3
Change-Id: I3b6790794db87b578c10894003ac832caad7c4b5
2020-05-29 17:38:54 +00:00