tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
59311 commits 1 branch 0 tags 121 MiB
Commit graph

428 commits

Author SHA1 Message Date
Dan Shi
ac9cf4482b Suppress gtest error for tests without any instance 
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
Merged-In: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
 2020-09-11 11:02:25 -07:00
Dan Shi
6b0fd062bb Suppress gtest error for tests without any instance 
Bug: 162052785
Test: m -j vts
Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21
 2020-09-08 10:42:38 -07:00
Robert Shih
cb5c081ff9 Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: 05453e2dd2 am: 9f0646f100 am: 30e592f3df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Ie9ec2153a1c9b564e3fb0135e3e393233954cd3a
 2020-08-28 21:15:29 +00:00
Robert Shih
30e592f3df Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 am: 05453e2dd2 am: 9f0646f100 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: Ib7863d4db8d057bd23d939afee213250fc56d9f8
 2020-08-28 21:02:18 +00:00
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
 2020-08-28 13:05:04 -07:00
Robert Shih
f4f299d96a Merge "VtsHalDrm: run tests in single shard" into stage-aosp-rvc-ts-dev am: c85c77653c am: 731d2e3bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12469588

Change-Id: I7ec5fa45332acee0a3664ca93ba8fe689439ffdd
 2020-08-28 20:03:16 +00:00
Robert Shih
f2eaf2c299 VtsHalDrm: run tests in single shard 
Currently drm cert provisioning is performed as an indivdual test case.
Other tests (e.g. decrypt tests) have dependency on drm cert
provisioning.

Bug: 165493235
Test: VtsHalDrmV1_0TargetTest
Test: VtsHalDrmV1_1TargetTest
Test: VtsHalDrmV1_2TargetTest
Test: VtsHalDrmV1_3TargetTest
Change-Id: I7aad35747997e6ce5b06919344475e0f2754cd15
 2020-08-27 08:58:04 -07:00
Dan Shi
ff985a85a8 Suppress gtest error for tests without any instance 
Bug: 162052785
Test: m -j vts
Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
 2020-07-29 09:46:36 -07:00
Dan Shi
9eaab747fe Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284 am: e5c9b5e722 am: 1a52c0eb25 am: 1a3e0f86eb 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050

Change-Id: I6ddea2dcb636e3ba67ad11d53b9fe12c51314c7a
 2020-07-29 06:36:31 +00:00
Dan Shi
e5c9b5e722 Suppress gtest error for tests without any instance am: ba4d532fee am: 73122cd284 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1374050

Change-Id: Ie5e956d4613f5e947c36ba4f1048f0c3aa8944ba
 2020-07-29 05:45:58 +00:00
Dan Shi
ba4d532fee Suppress gtest error for tests without any instance 
Bug: 162052785
Test: m -j vts
Change-Id: I8c1a48e6fbd7c8161137902b5332911fa0d7b8b3
 2020-07-28 15:12:32 -07:00
Bill Peckham
33ef5c2276 Merge "Convert Android.mk to Android.bp for vendor snapshot." am: 9b04c73565 am: c164e01c68 am: 1b187c1447 am: f59bd619c2 am: 14afcf2333 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1368997

Change-Id: I44e07933bb77270569c2299b6f992ac8c530f950
 2020-07-24 17:00:39 +00:00
Bill Peckham
1b187c1447 Merge "Convert Android.mk to Android.bp for vendor snapshot." am: 9b04c73565 am: c164e01c68 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1368997

Change-Id: I7ba6b90c5036fb9adfc6822bf566216290afa475
 2020-07-24 16:04:14 +00:00
Bill Peckham
294ad24d74 Convert Android.mk to Android.bp for vendor snapshot. 
This change enables the converted modules to be included
in the vendor snapshot, which considers only
soong-defined modules.

Conversion of the modules in this directory to
Android.bp was blocked by a build-time conditional check
of TARGET_ENABLE_MEDIADRM_64. Using a Soong config
variable, we can perform the conversion.

Bug: 161571531
Bug: 123557988
Test: Build with TARGET_ENABLE_MEDIADRM_64 :=
Test: Build with TARGET_ENABLE_MEDIADRM_64 := true
Test: Insepction of out/soong/soong.variables for each
Test: Inspection of target files package for each
Test: Verify inclusion of modules in vendor snapshot
Change-Id: I47c3b739dfafdf619f8a9a85de560652966af290
 2020-07-23 14:33:20 -07:00
Jooyung Han
d610435ac4 update hidl .bp 
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
 2020-07-07 16:22:36 +09:00
Jooyung Han
d18cba85fe update hidl .bp 
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
 2020-07-02 12:26:37 +09:00
Jooyung Han
b0907a6bb8 update hidl .bp 
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
 2020-07-02 09:18:17 +09:00
TreeHugger Robot
26a82198b3 Merge "Add WifiPreparer to drm tests to confirm wifi connection" into rvc-dev am: 2c29c52616 am: dd8881d373 am: ac4f105899 am: 561294807b 
Change-Id: I43f505c762e2826f70c898b8c712a8a4df8c9359
 2020-05-16 00:19:09 +00:00
TreeHugger Robot
dd8881d373 Merge "Add WifiPreparer to drm tests to confirm wifi connection" into rvc-dev am: 2c29c52616 
Change-Id: Ifc33021a5a3c737a74211735a1dc0c38372f7418
 2020-05-15 23:32:29 +00:00
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
5732df8917 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6 am: b614cc2bd4 am: b3a891ff0f am: 469dfc6767 
Change-Id: Ie8d1c60b677c6b0a3be7c6769a772c51550f9473
 2020-04-08 21:17:56 +00:00
Robert Shih
22930f4812 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba am: 72d8b4e540 am: bb6b690a41 am: 79da998598 
Change-Id: I93f321fd84d1159c6497739c7bf534c73270ac9c
 2020-04-08 20:53:59 +00:00
TreeHugger Robot
b3a891ff0f Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6 am: b614cc2bd4 
Change-Id: I94f923381f1761e54d6827d14f378d044410ca4b
 2020-04-08 20:53:27 +00:00
TreeHugger Robot
80a56796d6 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev am: bb14d6b3b6 
Change-Id: Ie3560f346b6fdaded3373d48b2acc06da67a2eeb
 2020-04-08 20:43:10 +00:00
TreeHugger Robot
bb14d6b3b6 Merge "Add libvtswidevine dep to VtsHalDrmV1_3TargetTest" into rvc-dev 2020-04-08 20:29:46 +00:00
Robert Shih
bb6b690a41 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba am: 72d8b4e540 
Change-Id: Ib6585253f050f253032eda6e8731c62c7a868796
 2020-04-08 20:25:06 +00:00
Robert Shih
d7c3a55282 Merge "drm 1.3 vts: call signRSA with non-empty args" into rvc-dev am: 9ef4f067ba 
Change-Id: Ia556b0d1216f4ddfede373bbd4b918745bbd4cde
 2020-04-08 20:08:51 +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
eb5f33e0ef Rename vts-core to vts am: ba894f81db am: 55d110bcd0 
Change-Id: Ifc137320af42febc24937f09e5baa4c5a95ac1c4
 2020-04-07 23:56:42 +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
ae2270e1c4 Merge "Push prebuilt libvtswidevine to device for drm HAL test" into rvc-dev am: 1e169a2760 
Change-Id: I35c466c3dbef687827729adf5e7880c0a2f6b9f6
 2020-04-07 22:28:00 +00:00
Dan Shi
ba894f81db 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 15:17:02 -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
3a8a650c61 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
 2020-04-07 18:03:49 +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
Automerger Merge Worker
a8be8e7428 Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b am: 9791bf088d am: 9473152c95 am: 0b61d70db2 
Change-Id: Ie1ffd4a7a19b9fde6c8386d374a76c164e2de062
 2020-03-06 20:23:12 +00:00
Automerger Merge Worker
9473152c95 Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b am: 9791bf088d 
Change-Id: I89e801eb70552ad22edcbe616a6afaafeeda2ee2
 2020-03-06 20:04:31 +00:00
Automerger Merge Worker
3419a7786d Merge "drm@1.3 vts: link dynamic libcrypto.so to pass FIPS" into rvc-dev am: 94f97bdf1b 
Change-Id: Idbf10b2e60b819aecb344b6247148bb669c4d9a9
 2020-03-06 19:46:15 +00:00
Dan Shi
7c6d8350b5 Merge "Push prebuilt libvtswidevine to device for drm HAL test" 2020-03-03 16:57:33 +00:00
Automerger Merge Worker
ea9e71ac11 Merge "drm vts: link dynamic libcrypto.so to pass FIPS" am: 5fe9f89858 am: 086c30878e 
Change-Id: Id15b7a05b2f65bc89587335abc40a99d7a9d8106
 2020-03-03 05:58:46 +00:00
Automerger Merge Worker
086c30878e Merge "drm vts: link dynamic libcrypto.so to pass FIPS" am: 5fe9f89858 
Change-Id: I73475101a6390a921269b3b68e702aa5c653258d
 2020-03-03 05:47:27 +00:00
Treehugger Robot
5fe9f89858 Merge "drm vts: link dynamic libcrypto.so to pass FIPS" 2020-03-03 05:33:25 +00: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
Dan Shi
d7c88e3e55 Push prebuilt libvtswidevine to device for drm HAL test 
Bug: 143220441
Test: atest VtsHalDrmV1_3TargetTest
Change-Id: I08af2bf9524b0bbb362c28eceef5e6642545ecc7
 2020-03-02 14:11:00 -08:00
Automerger Merge Worker
dfecdb5358 Merge "Push prebuilt libvtswidevine to device for drm HAL tests" am: 99b3f37a51 am: 3e83f9593b 
Change-Id: Ied9cf2afdc0e0c37c41febcd507bd6396b84de1e
 2020-02-27 23:22:03 +00:00
Automerger Merge Worker
3e83f9593b Merge "Push prebuilt libvtswidevine to device for drm HAL tests" am: 99b3f37a51 
Change-Id: Ia3591c7e4066f10c87d4a521c54dde8d69bf22b1
 2020-02-27 23:06:05 +00:00
Robert Shih
d85c649e5b drm vts: link dynamic libcrypto.so to pass FIPS 
Bug: 149035295
Test: VtsHalDrmV1_0TargetTest
Test: VtsHalDrmV1_2TargetTest
Change-Id: I6206e39411ccf0ccd72dd02d9b9d932f7d488a42
 2020-02-26 15:31:23 -08:00
Dan Shi
3d0285b182 Push prebuilt libvtswidevine to device for drm HAL tests 
Bug: 143220441
Test: atest VtsHalDrmV1_0TargetTest \
  VtsHalDrmV1_1TargetTest\
  VtsHalDrmV1_2TargetTest
Change-Id: I4ad91c99956525120549321d227aaf6864877c76
 2020-02-26 09:24:34 -08: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
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

Change-Id: I3a331b5e1c5418426a084f1c7bfe436214a1b68f
 2019-11-26 15:00:11 -08:00
Steven Moreland
0942e33017 Merge "./update-makefiles.sh, for union changes/memory" 
am: 00daede4d5

Change-Id: Ie67ccdf2decd3643936793a17d23646452a227b2
 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

Change-Id: I7cef34166243e60df62b9ab2a1cb8de3142e4104
 2019-09-26 07:54:40 -07:00
Colin Cross
06b758a918 Merge "Use libcrypto_static instead of libcrypto" 
am: c048c187be

Change-Id: I0c5d5843b8003f6be14ba583e7299693b25da7c0
 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

Change-Id: Ib2cc45a2f430e8bdc1cdeab430b37b69a565709f
 2019-09-11 21:37:12 -07:00
Robert Shih
103efe8c40 default hidl CryptoPlugin: security fixes am: 1e18883b72 am: 02ef6a6283 
am: 4d3b73ee5e

Change-Id: I984dbf4463f731bced310342b5763a14ad0cdc4d
 2019-09-11 21:30:09 -07:00
Robert Shih
f6e7c9ed25 default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447fe 
am: 756f134fcc

Change-Id: I4289e38c6eab3e8cac9e489a08f74b3efcf008f9
 2019-09-11 21:18:04 -07:00
Robert Shih
756f134fcc default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] 
am: d22f1447fe

Change-Id: I480b83a0c4ffd752637ff5357b30d6f5c1916b4b
 2019-09-11 21:10:00 -07:00
Robert Shih
02ef6a6283 default hidl CryptoPlugin: security fixes 
am: 1e18883b72

Change-Id: Ifbbc3cf6c827085046259365808d962ad192c55a
 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

Change-Id: I660b0423d97e6402de84be904e0e84c6763518a3
 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

Change-Id: Iaedfceb49f81387f7deaad434613b7c9f1c502a0
 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

Change-Id: I78be3e06995b60dbe9cca6fedbc93f4c26d8c770
 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

Change-Id: I2178215a3cbb44a830690081f008c3053282fe65
 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

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
 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

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
 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

Change-Id: Ib139d710d47a7a51e24ba8ba582b252f5ff6e244
 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

Change-Id: Iff1292a68022495c06438ba479dffc41520e2ace
 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