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
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
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
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
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
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
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
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
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
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
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
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
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
