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
