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
Robert Shih
d056adc919
default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 am: 4d3b73ee5e
...
am: c1d79c8182
2019-09-11 21:37:12 -07:00
Robert Shih
103efe8c40
default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283
...
am: 4d3b73ee5e
2019-09-11 21:30:09 -07:00
Robert Shih
f6e7c9ed25
default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe
...
am: 756f134fcc
2019-09-11 21:18:04 -07:00
Robert Shih
756f134fcc
default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
...
am: d22f1447fe
2019-09-11 21:10:00 -07:00
Robert Shih
02ef6a6283
default hidl CryptoPlugin: security fixes
...
am: 1e18883b72
2019-09-11 21:09:00 -07:00
Robert Shih
d22f1447fe
default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE]
...
* reject native handle output for clearkey
* validate subsample sizes
Bug: 137370777
Test: cryptopoc
Change-Id: I2a81f2a00ebf7954b16fb10d2af586ce0da801ed
2019-09-11 22:08:28 +00:00
Robert Shih
1e18883b72
default hidl CryptoPlugin: security fixes
...
* reject native handle output for clearkey
* validate subsample sizes
Bug: 137370777
Test: cryptopoc
Change-Id: Idf075e1a297fe1ab3ea3e1621806dd46b4a51e35
2019-09-11 22:08:19 +00:00
TreeHugger Robot
7b2e2fe15c
Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
2019-09-11 20:31:38 +00:00
Colin Cross
45cd136049
Remove unused libcrypto dependency. am: 5d81a5814b
...
am: 84633dea30
2019-09-10 18:02:04 -07:00
Colin Cross
5d81a5814b
Remove unused libcrypto dependency.
...
libcrypto is unused, which causes problems when boringssl hash
injection is turned on as the code is all stripped and there is
nothing left to inject the hash into.
Bug: 137267623
Test: Ran the following together with the changes from
http://r.android.com/q/topic:bug137267623_bsslselftest
m VtsHalDrmV1_{0,1,2}TargetTest \
VtsHalWifiHostapdV1_{0,1}TargetTest{,Util} \
VtsHalWifiSupplicantV1_{0,1,2}TargetTest{,Util} \
VtsHalWifiSupplicantP2pV1_{0,2}TargetTest
(croot hardware/interfaces/confirmationui ; mma)
(croot hardware/interfaces/drm ; mma)
(croot hardware/interfaces/keymaster ; mma)
Change-Id: Ib0607671ef71d99becb483774f810aad9762f4f1
2019-09-10 00:05:33 +01:00
Xin Li
15be13ea71
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
2019-09-08 13:06:54 -07:00
Steven Moreland
6684ee8c36
Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a
...
am: 8c22c3862f
2019-09-06 14:28:04 -07:00
Steven Moreland
b3a4d3832e
Remove libhwbinder/libhidltransport deps
...
Since these were combined into libhidlbase.
Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
zhangweiwei
424308c5ad
Adapt change clearkey to Lazy hal
...
am: 0a50473369
2019-07-18 00:11:19 -07:00
zhangweiwei
0a50473369
Adapt change clearkey to Lazy hal
...
Exempt-From-Owner-Approval
Bug:135896867
Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target
Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
2019-07-17 23:24:56 +00:00
Jeff Tinker
97bf88fea2
Merge "Add status for license starting in the future" into qt-dev
...
am: a51399ef5f
2019-05-08 10:49:33 -07:00
Robert Shih
31703179a5
Add status for license starting in the future
...
Bug:116738851
Test: vts-tradefed run commandAndExit -m VtsHalDrmV1_2Target
Change-Id: Id5017e3ffa1fcf5aaad1815b59a425ac63f2e53e
2019-05-08 00:52:01 +00:00
Steven Moreland
99712c08cc
Update hidl makefiles for bpfmt
...
hidl-generated makefiles are now generated such that bpfmt(file) == file.
Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346
Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
...
am: 96f40f7b02
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f
Update hidl makefiles for bpfmt
...
hidl-generated makefiles are now generated such that bpfmt(file) == file.
Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Robert Shih
c13e0f6db2
Merge "DrmHalTest.OfflineLicenseStateTest: search keySetId"
2019-03-12 20:46:45 +00:00
Robert Shih
90af5f1898
DrmHalTest.OfflineLicenseStateTest: search keySetId
...
Search for key set id instead of simply checking the number of total
offline licenses.
Fix LOG_TAG & remove clearkey specific comments from generic plugin
tests.
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I245007317c813d5a8585d0a4ee29816b8f51ad3c
2019-03-11 18:07:33 -07:00
Robert Shih
4add15d0c9
Amend drm@1.2 vts mock errors
...
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I05cc92d33a50b37ce12d8295cdd129d2653836d1
2019-03-08 15:19:54 -08:00
Robert Shih
295e27ee5a
Merge "Add vts tests for new drm@1.2 methods"
2019-03-08 02:39:05 +00:00
Robert Shih
456f3a6447
Add vts tests for new drm@1.2 methods
...
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: If0da1538c33e0284fa6fa6dd48d56a0ce1753f02
2019-03-06 15:54:53 -08:00
Steven Moreland
87f43604b9
Merge "Update makefies: no 'types' internal"
2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda
Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
...
am: 7224bc9bcf
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0
Update makefies: no 'types' internal
...
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00
Steven Moreland
a878aee9ab
Update makefies: no 'types'
...
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Steven Moreland
f8a47b7f01
Update makefiles.
...
Bug: 123976090
Test: N/A
Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
2019-02-11 21:14:16 -08:00
Jeff Tinker
100a4eddcf
Fix comment on removeOfflineLicense
...
bug:117570956
Change-Id: Iad1a15d81066d01387ec9addd420040155216a75
2019-01-31 09:44:26 -08:00
Jeff Tinker
08ff314594
Add securityLevel to MediaDrm isCryptoSchemeSupported API
...
bug:110701831
test: cts media test cases, widevine integration tests
Change-Id: I9e4679ee63b3997f7141c9b81fd6f375e862862d
2019-01-22 23:27:26 +00:00
Jeff Tinker
30c31856d5
Add support for HDCP 2.3
...
bug:120040804
Change-Id: Id4643829bce31131e3bc7b628737579bb597e736
2019-01-14 21:17:13 -08:00
Jeff Tinker
8378c6625e
Add additional error conditions to MediaDrm
...
New codes are being added to handle resource
contention, lost session state, frame size too
large and insufficient security level for
decryption. Also cleans up inconsistent use of
tamper detected error where invalid state error
should have been used.
bug:111504510
bug:111505796
test: cts and gts media test cases
Change-Id: I8581aed1871d728f7af80b246d0dba28b40fa4a3
2019-01-10 17:27:59 -08:00
Peter Kalauskas
724a9fc643
Add lazy service target for drm HAL
...
Test: Run gts on Pixel 1/2/3, marlin_svelte, and walleye_svelte
Bug: 112386116
Change-Id: I5d86e3158794ebae967efb009a0cef8cd140ccb7
2019-01-08 09:00:23 -08:00
Chih-hung Hsieh
df66e3cb29
Merge "Fix performance-for-range-copy warnings" am: d01f7050ac am: 51e835ce22
...
am: 86fefab5e9
2018-12-17 14:09:52 -08:00
Chih-Hung Hsieh
65ab67312b
Fix performance-for-range-copy warnings
...
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
2018-12-17 19:57:21 +00:00
Keun Soo YIM
68ae05dd2d
pack VTS cc_test binaries as general-tests
...
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Keun Soo YIM
ff84c37bc1
pack VTS cc_test binaries as general-tests
...
Test: make general-tests
Bug: 120093339
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-11-27 16:11:41 -08:00
Jeff Tinker
287ef4c733
Define offline methods in DRM HAL version 1.2
...
bug:117570956
bug:110838441
bug:116252891
Change-Id: Ie94d5c2174d851eb2b40dcc7bf4596af71e14176
2018-11-08 15:50:38 -08:00
Yifan Hong
438cc30a06
Merge "DRM 1.1: Add VINTF doc" am: 8ad3e78d27 am: 2524404aae
...
am: adf2018492
2018-10-26 14:30:49 -07:00
Yifan Hong
3baef77daa
DRM 1.1: Add VINTF doc
...
Test: none
Bug: 73556059
Bug: 111192666
Bug: 111096955
Bug: 117636317
Bug: 112150995
Fixes: 112282263
Change-Id: I361f50b5af19094c36f928939ca6d764ce59a205
2018-10-25 16:50:06 -07:00
Jeff Tinker
5c2e29de11
Fix failing drm 1.0 vts tests
...
The shared library path was incorrectly set based on
the drm.64bit.enabled flag. It should be set based
on whether the drm service is running as 32-bit or
64-bit.
Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target
bug:111289939
Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
Merged-In: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
2018-09-13 00:39:42 +00:00
Jeff Tinker
3418cd6077
Remove spurious error log message
...
In change id Ie2f306bce6aec697ae584da3f55b3cf72edaa07b, a
shared memory leak was fixed using a workaround that
maintained compatibility with the frozen DRM HAL API
1.1. Unfortunately it triggered an error log message that
was no longer an error condition. This change just removes
the log line to avoid raising undue concerns.
Change-Id: I9abe08ef5ab86b2f8589a5c1e5c5175e19ab09d2
Test: Compiles
Bug:111131173
2018-07-31 18:34:12 +00:00
Jeff Tinker
b065c9d8b7
Fix failing drm 1.0 vts tests
...
The shared library path was incorrectly set based on
the drm.64bit.enabled flag. It should be set based
on whether the drm service is running as 32-bit or
64-bit.
Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target
bug:111289939
Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
2018-07-20 16:36:05 -07:00
Jeff Tinker
2b46111ec8
Add more drm@1.1 VTS structure tests
...
Adding tests for:
getKeyRequest_1_1
getSecureStopIds
releaseSecureStops
removeSecureStop
removeAllSecureStops
test:vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target
bug:73330999
Change-Id: Icd6c3e679ea674f899563a8d8e428321a7783633
2018-03-27 16:30:34 -07:00
Nathan Harold
c893754c0d
Update Makefiles Missed In Previous Commits
...
When calling update-makefiles.sh there are
some unrelated changes that were missed in
previous commits.
Bug: 8675309
Test: compilation
Change-Id: I5bf67fbcc809de36bde1869ada7b835566a5198b
2018-03-19 16:37:46 -07:00
Zhuoyao Zhang
b83c4f2e12
Merge "Convert drm hal test to use VtsHalHidlTargetTestEnvBase"
2018-02-20 01:45:42 +00:00
Zhuoyao Zhang
cf50a32e57
Convert drm hal test to use VtsHalHidlTargetTestEnvBase
...
* The testEnvBase template is only used to register the testing hal.
* The service name is specifically determined by the test logic, so
disable the feature for vts to run the test against all service
instance (by setting HalServiceCombMode::NO_COMBINATION)
Bug: 64203181
Test: make vts
vts-tradefed run vts -m VtsHalDrmV1_0Target
vts-tradefed run vts -m VtsHalDrmV1_1Target
Change-Id: Ib2e005e8ccbc815067f0e9455fcd3e6c5ec151fb
2018-02-13 15:25:59 -08:00
TreeHugger Robot
1233c1046d
Merge "Revert "Revert "VTS tests for fixed MediaDrm security level APIs"""
2018-02-12 17:55:50 +00:00
Jeff Tinker
6c2589f524
Revert "Revert "VTS tests for fixed MediaDrm security level APIs""
...
This reverts commit 6ec159b780
2018-02-11 18:58:55 +00:00
Jeff Tinker
199d60da8c
Revert "Revert "Fix MediaDrm security level APIs""
...
This reverts commit a824afa9c4
2018-02-11 18:58:21 +00:00
Tobias Thierer
6ec159b780
Revert "VTS tests for fixed MediaDrm security level APIs"
...
This reverts commit 45c3855f4fhttps://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log
Change-Id: Ie61888464a2ac17b1ee6f47b23f5bb84fdbfa095
2018-02-11 15:01:58 +00:00
Tobias Thierer
a824afa9c4
Revert "Fix MediaDrm security level APIs"
...
This reverts commit 6a5934aee3https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log
Change-Id: I8a1ce95ca6f48bec6c46f84a0fef7a48f975c406
2018-02-11 15:01:51 +00:00
Jeff Tinker
45c3855f4f
VTS tests for fixed MediaDrm security level APIs
...
Vendors implementing the newly added MediaDrm.setSecurityLevel
HAL found that it was difficult to implement properly. Also the
semantics are somewhat ambiguous from the Java platform API
level. The APIs have changed to bind the security level
assignment to openSession which clarifies the API for apps as
well as making it more natural to implement in HAL modules. This
CL updates the VTS tests to account for those changes.
bug:72831697
bug:64001680
test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: I2adf13f9da7726b206df6fcc82b1e2e11fc94674
2018-02-08 01:48:03 +00:00
Jeff Tinker
6a5934aee3
Fix MediaDrm security level APIs
...
During development of the vendor/widevine HAL module, the newly added
MediaDrm.setSecurityLevel method was found to be difficult to
implement efficiently since the security level is needed at the time
a session is opened. This CL moves the security level parameter to
openSession to resolve this problem.
bug:72831697
bug:64001680
test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: Id9c765131d0ee6fa85f83d098955acf603229b46
2018-02-08 01:47:45 +00:00
Adam Stone
9d127768d1
Add getMetrics test to drm vts test.
...
Adds test cases for the getMetrics call in the DRM 1.1 HAL clear key
implementation.
Bug: 64001680
Test: VtsHalDrmV1_1TargetTest
Change-Id: I7c292f79f7477a6a88296aa62eae02cc70e35102
2018-02-02 17:44:53 -08:00
TreeHugger Robot
635d13fff4
Merge "Add vts tests for new drm@1.1 methods"
2018-02-02 21:50:30 +00:00
Jeff Tinker
6a465fda8c
Merge "Fix incorrect comment in ICryptoFactory.hal"
2018-02-02 21:38:46 +00:00
Jeff Tinker
203c8514e2
Add vts tests for new drm@1.1 methods
...
Test: VtsHalDrmV1_1TargetTest
Methods are for querying HDCP, security levels
and number of sessions.
Change-Id: Iaa865a0201a4c10b0c6b055aabab146dd31a2d01
2018-02-02 10:31:21 -08:00
Jeff Tinker
c707779488
Fix incorrect comment in ICryptoFactory.hal
...
The comment referenced drm@1.1::ICryptoPlugin which
doesn't exist.
bug:64001680
bug:33657579
Change-Id: I6905fb4b8e3e1386b999ba64a6ca5f160d1c4eff
2018-02-01 12:26:43 -08:00
