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
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
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
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
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
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
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
Robert Shih
b169712df0
Merge "Add Drm 1.3"
2019-12-03 17:33:03 +00:00
Robert Shih
37e52fa88d
Add Drm 1.3
...
New API(s):
* IDrmFactory::getSupportedCryptoScheme
Bug: 139134043
Test: MediaDrmTest
Change-Id: Ibe8c7eabcbdd96618c7c336281582ff19f349de9
2019-11-27 01:12:09 +00:00
Steven Moreland
c2a2995047
Merge "./update-makefiles.sh, for union changes/memory" am: 00daede4d5 am: 0942e33017
...
am: 87fe284668
2019-11-26 15:00:11 -08:00
Steven Moreland
0942e33017
Merge "./update-makefiles.sh, for union changes/memory"
...
am: 00daede4d5
2019-11-26 14:55:40 -08:00
Steven Moreland
7696aa885f
./update-makefiles.sh, for union changes/memory
...
Many more types can be used in Java.
Bug: 143566068
Test: N/A
Change-Id: Ie18e1e0f9c22f2ea15b755df3b048c9d651c4945
2019-11-26 09:24:31 -08:00
Robert Shih
d79abbb0d3
default drm hidl: Fix decrypt destination base ptr
...
Bug: 144351324
Test: poc_CryptoPlugin_155
Change-Id: Id5d221cd6978d55c46c0368aceb10c1d2f559fd9
2019-11-18 08:23:30 +00:00
Edwin Wong
9b845c6eb3
Merge "Add CTS/GTS tests for TH presumbit."
2019-10-10 17:38:52 +00:00
Edwin Wong
9bc4e8696e
Add CTS/GTS tests for TH presumbit.
...
Define CTS/GTS filters in TEST_MAPPING.
Test: time atest
bug: 138259722
Change-Id: Ib7f27dc5eb8699260cf6b79b03d45de6390aa6f7
2019-10-02 17:33:22 -07:00
Colin Cross
978e59e401
Merge "Use libcrypto_static instead of libcrypto" am: c048c187be
...
am: 06b758a918
2019-09-26 07:54:40 -07:00
Colin Cross
06b758a918
Merge "Use libcrypto_static instead of libcrypto"
...
am: c048c187be
2019-09-26 07:42:20 -07:00
Colin Cross
263d2df2c7
Use libcrypto_static instead of libcrypto
...
Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.
Bug: 141248879
Test: m checkbuild
Change-Id: I8685cb06d15f3425eeb96d998ffda54c82dcd387
2019-09-18 11:07:09 -07:00
