Commit graph

287 commits

Author SHA1 Message Date
Dan Shi
15bbf84240 Add WifiPreparer to drm tests to confirm wifi connection
The tests require wifi connectivity.

Bug: 156266690
Test: none
Change-Id: Ib5116d62265241938f9292956b3c4829da7b425e
2020-05-14 23:44:38 -07:00
TreeHugger Robot
bb14d6b3b6 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev 2020-04-08 20:29:46 +00:00
Robert Shih
9ef4f067ba Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev 2020-04-08 19:57:52 +00:00
Dan Shi
4c6e4c7ec4 Merge "Rename vts-core to vts" into rvc-dev 2020-04-08 03:58:41 +00:00
Dan Shi
aad51fa000 Rename vts-core to vts
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-04-07 16:37:40 -07:00
TreeHugger Robot
b95fc85203 Merge "Push prebuilt libvtswidevine to device for drm HAL tests" into rvc-dev 2020-04-07 22:08:45 +00:00
Dan Shi
f956a7ea0a Push prebuilt libvtswidevine to device for drm HAL tests
Bug: 143220441
Test: atest VtsHalDrmV1_0TargetTest \
  VtsHalDrmV1_1TargetTest\
  VtsHalDrmV1_2TargetTest
Change-Id: I4ad91c99956525120549321d227aaf6864877c76
Merged-In: I4ad91c99956525120549321d227aaf6864877c76
2020-04-07 12:55:00 -07:00
Dan Shi
ee9f3acae3 Push prebuilt libvtswidevine to device for drm HAL test
Bug: 143220441
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I08af2bf9524b0bbb362c28eceef5e6642545ecc7
(cherry picked from commit d7c88e3e55)
2020-04-07 18:44:19 +00:00
Dan Shi
fbf9d924a2 Add libvtswidevine dep to VtsHalDrmV1_3TargetTest
Bug: 150468341
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I3885efd35c97a5451881c2f6dd8fdf86bf12d089
2020-04-07 06:53:28 +00:00
Robert Shih
bedb2d9ce3 drm 1.3 vts: call signRSA with non-empty args
Bug: 153356263
Test: VtsHalDrmV1_3TargetTest
Change-Id: If6c6e9f478458c004063cebc195e7e77084fc11d
2020-04-06 16:53:55 -07:00
Robert Shih
65f6b95b6d drm@1.3 vts: link dynamic libcrypto.so to pass FIPS
Bug: 149035295
Test: VtsHalDrmV1_3TargetTest
Change-Id: I34d3537d1008c2d03db78b33687879b9fe24e8ad
2020-03-03 04:27:23 +00:00
Robert Shih
3559eb0e8b drm: add 1.3 vts
Bug: 139313724
Bug: 139134043
Change-Id: I54af955790e76dc364e7ff9f9d6984d9b6abbb68
2020-01-31 22:07:01 -08:00
Automerger Merge Worker
478f7ca620 Merge "drm vts 1.2 refactor" am: 568b391009 am: 5200f40770 am: 2be492bc6a
Change-Id: Ied460532655545b0d1d56a5a433362be42155c7b
2020-01-31 16:28:25 +00:00
Automerger Merge Worker
5200f40770 Merge "drm vts 1.2 refactor" am: 568b391009
Change-Id: I8aca7873679cf278e4adc9345f1056c03ea2e935
2020-01-31 16:15:21 +00:00
Robert Shih
ddf6b96e0c drm vts 1.2 refactor
* accept drm scheme as part of test parameter
* extract test cases into separate library

Bug: 142397658
Change-Id: I859e384a832035087475714fd84905ac89e911be
2020-01-29 14:02:04 -08:00
Automerger Merge Worker
3f054b5b24 Merge "drm vts 1.0 refactor" am: ae3a851727 am: aba5f2f610 am: 2920ac4f90
Change-Id: I7bec3b671cf681e74c11b589cef690ad6861eb9a
2020-01-29 05:59:33 +00:00
Robert Shih
aba5f2f610 Merge "drm vts 1.0 refactor"
am: ae3a851727

Change-Id: I6216e690fb74bfcf0cc02dbed2093b6a33677c88
2020-01-28 21:37:33 -08:00
Robert Shih
ae3a851727 Merge "drm vts 1.0 refactor" 2020-01-29 05:31:10 +00:00
Automerger Merge Worker
708c1b7499 Merge "drm vts 1.1 refactor" am: 8aa8655f24 am: bdfb1cc257 am: d5a9aed754
Change-Id: I5debd1bb1611342f37411b1aea27bf034d79c80f
2020-01-29 04:23:19 +00:00
Robert Shih
bdfb1cc257 Merge "drm vts 1.1 refactor"
am: 8aa8655f24

Change-Id: Icd678ddc89164dc76665ee5af4958cbf14294c34
2020-01-28 19:57:08 -08:00
Robert Shih
8aa8655f24 Merge "drm vts 1.1 refactor" 2020-01-29 03:51:32 +00:00
Automerger Merge Worker
9610b59d0d Merge "Add drm hal/vts owners" am: 72c3a98e9f am: d94926c55d am: 9e93e423e9
Change-Id: Ie43b0d797632a6206d636e6421c0e2f14b624ddc
2020-01-29 00:20:24 +00:00
Robert Shih
d94926c55d Merge "Add drm hal/vts owners"
am: 72c3a98e9f

Change-Id: If29d7653aa2d75bf9a839519738146fefd2bebec
2020-01-28 15:12:33 -08:00
Robert Shih
e44ad509d6 Add drm hal/vts owners
Change-Id: Ie6f0116a0fc9f4590b3a272d877c0d5be719d624
2020-01-28 13:14:09 -08:00
Robert Shih
ec5d8ab919 drm vts 1.0 refactor
* accept drm scheme as part of test parameter
* extract test cases into separate library

Bug: 142397658
Change-Id: I2f56d4e892b2fe45eabf37b351b5017a67828ee4
2020-01-28 05:17:28 +00:00
Automerger Merge Worker
d8f473f231 Merge "drm vts: introduce helper library" am: 3a8eb92143 am: d3411d0ce4 am: c1d3ef566c
Change-Id: I43c820f1595ee9111b5c9999d3f41845e8c7553d
2020-01-28 00:46:45 +00:00
Robert Shih
d3411d0ce4 Merge "drm vts: introduce helper library"
am: 3a8eb92143

Change-Id: I8960aa5d7a264c37916335dc898a914e0c8bd9cf
2020-01-27 16:16:50 -08:00
Treehugger Robot
3a8eb92143 Merge "drm vts: introduce helper library" 2020-01-27 23:37:31 +00:00
Robert Shih
a78064a1bf drm vts 1.1 refactor
* accept drm scheme as part of test parameter
* extract test cases into separate library

Bug: 142397658
Change-Id: I91b0a003b98930172f15a4b6045e6ce1e5622d98
2020-01-27 15:01:30 -08:00
Robert Shih
f2fd4adece drm vts: introduce helper library
The helper library includes
* gtest parameter structure (hal instance name, drm scheme uuid)
* existing vendor module APIs

Bug: 142397658
Test: VtsHalDrmV1_0TargetTest
Change-Id: Ifbb443fcb1414e45de2a2073ec545ddd422b9a4d
2020-01-27 20:16:43 +00:00
Automerger Merge Worker
ed17823063 drm@1.2 vts: force provision multiple security levels am: ab61b8024e am: fa38b7bfa1 am: 2ec8201050
Change-Id: I1a688d2057fbeffe350b6088fc1cc4e7a689dc7c
2020-01-24 21:02:40 +00:00
Automerger Merge Worker
fa38b7bfa1 drm@1.2 vts: force provision multiple security levels am: ab61b8024e
Change-Id: Ibe5a94665e5c7cf77dc40c48896160d7ea1497dd
2020-01-23 23:32:44 +00:00
Robert Shih
ab61b8024e drm@1.2 vts: force provision multiple security levels
Bug: 145112387
Bug: 145482532
Bug: 146190325
Bug: 146390725
Bug: 146401147
Bug: 146849109
Bug: 147314842
Bug: 147467803
Bug: 147704960
Test: DrmHalTest.OfflineLicenseTest
Change-Id: I705507101b051ee6ac56fec36ca45d476bf82630
2020-01-23 10:27:53 -08:00
Automerger Merge Worker
0c9977c3c2 Merge "misc drm@1.2 vts fixes" am: 1d85278536 am: cf7622ccd6 am: 861f5e15a8
Change-Id: I76875057e9f8bdb3bac85e6b89e5652a59308e37
2020-01-23 00:36:44 +00:00
Robert Shih
cf7622ccd6 Merge "misc drm@1.2 vts fixes"
am: 1d85278536

Change-Id: If954db85d1d5b6e8eddbf0b18c382c31ea618ad6
2020-01-22 16:09:02 -08:00
Robert Shih
52cb498569 misc drm@1.2 vts fixes
* Add VendorModules::getModuleByName
* Skip unsupported schemes in setup
* Skip non-clearkey instances when running clearkey specific tests
* Don't skip clearkey tests for clearkey instance

Bug: 142397658
Change-Id: I44a6b43dd52fbb48cdbb5a077517e3d96acd0a3d
2020-01-22 21:23:14 +00:00
Automerger Merge Worker
27b734a8b7 Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test" am: ca61d1a366 am: d246996124 am: e7682a1b81
Change-Id: Ia4e94cd5c40b8cb8c47c03d96714d3fe7ff4aa0b
2020-01-16 19:14:42 +00:00
Steven Moreland
d246996124 Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test"
am: ca61d1a366

Change-Id: Ieff14ff236c884e5611075258695987a2a606256
2020-01-16 10:38:30 -08:00
Steven Moreland
ca61d1a366 Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test" 2020-01-16 18:35:02 +00:00
Xin Li
7b2064edd5 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I4aec05062d527bd14512c0ef4c74f66d4a4ce431
2020-01-15 15:57:11 -08:00
Dan Shi
d5f85888fe Convert VtsHalDrmV1_*TargetTest to be parameterized test
Removing dependency from VTS infrastructure so that test can run
standalone, for instance with atest/TEST_MAPPING. Once this is
done for every test, VTS can use the core testing infra.

Bug: 142397658
Test: atest VtsHalDrmV1_0TargetTest VtsHalDrmV1_1TargetTest \
  VtsHalDrmV1_2TargetTest
Change-Id: Ic436d949f5b26087e32c48fac220cd5abad8a443
2020-01-15 20:24:08 +00:00
Automerger Merge Worker
586f08acad Merge "Fix tests for devices that don't have drm@1.2 services" am: ac16446bd2 am: bebc590eba am: d0145126db
Change-Id: Ic751c4f1a74addfeae51e42275e077a922c9fcc5
2020-01-15 18:56:40 +00:00
Automerger Merge Worker
d0145126db Merge "Fix tests for devices that don't have drm@1.2 services" am: ac16446bd2 am: bebc590eba
Change-Id: Iff7836115e7ced22d91bf848fd9fa4651a7cdab7
2020-01-15 18:44:15 +00:00
Jeff Tinker
542290ad55 Fix tests for devices that don't have drm@1.2 services
This CL fixes a null pointer dereference that is triggered
when VtsHalDrmV1_2TargetTest is run on a device that
doesn't implement a drm@1.2 vendor service, for any
drm scheme where a vts vendor module is provided. In this
case the test will be skipped.

test: VtsHalDrmV1_2TargetTest

bug:145965256
Change-Id: I43c87db9b560d2024c0fb15cd44d106067ed48ae
2020-01-10 01:34:55 +00:00
Automerger Merge Worker
e019586ca4 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d am: 43f65e0f60 am: 66fb6492f5
Change-Id: I4277d01e621525e78977f5b12663f122827a62ea
2020-01-09 05:37:18 +00:00
Automerger Merge Worker
66fb6492f5 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d am: 43f65e0f60
Change-Id: I66ebe64f3387a8b46eb745c6b037877605e05945
2020-01-09 05:21:10 +00:00
Automerger Merge Worker
119b9ea01d default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
2020-01-09 04:51:59 +00:00
Automerger Merge Worker
0e8630788f default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
2020-01-09 04:33:04 +00:00
Automerger Merge Worker
44fa9a5cf0 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac
Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
2020-01-09 04:14:08 +00:00
Automerger Merge Worker
86828796ac default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3
Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
2020-01-09 03:59:10 +00:00