Commit graph

95 commits

Author SHA1 Message Date
Jeff Tinker
7a0385c44a Merge "Revert "Fix resource leaks in drm hal"" into oc-dev am: db15c4b6ee
am: ddd1c63569

Change-Id: Iab79f9667ed22427c11e133da60b3371723239bb
2017-05-16 19:33:23 +00:00
Jeff Tinker
ddd1c63569 Merge "Revert "Fix resource leaks in drm hal"" into oc-dev
am: db15c4b6ee

Change-Id: Ib2b3078f95637fe3c4f4f6e0bd73498374f945f5
2017-05-16 18:50:29 +00:00
Jeff Tinker
db15c4b6ee Merge "Revert "Fix resource leaks in drm hal"" into oc-dev 2017-05-16 18:25:51 +00:00
Jeff Tinker
e3b6ae14f5 Revert "Fix resource leaks in drm hal"
This caused b/38343526 which is a chase list issue, reverting for now.

This reverts commit 4e1fe736af.

Change-Id: Ib9ffcd11e575e3f05f54cbea17fda2f2eb3780b5
2017-05-16 18:21:39 +00:00
Jeff Tinker
24401aac69 Merge "Fix resource leaks in drm hal" into oc-dev am: 14b91049a7
am: fbe6eee2e5

Change-Id: Ied6aca47ea624dad2ae7778b4e70397dfaf02a4f
2017-05-15 20:14:20 +00:00
Jeff Tinker
fbe6eee2e5 Merge "Fix resource leaks in drm hal" into oc-dev
am: 14b91049a7

Change-Id: Iedefddb99f498e968a22b50fe09c589f43907ff6
2017-05-15 20:03:22 +00:00
TreeHugger Robot
14b91049a7 Merge "Fix resource leaks in drm hal" into oc-dev 2017-05-15 19:54:16 +00:00
Steven Moreland
d09cf863da Update makefiles for c++-sources and c++-headers. (2/2) am: bc71124120
am: a32ebce372

Change-Id: Ic1dd8f98e72656bc12a6e5224e541f75afb79daa
2017-05-11 01:38:14 +00:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Jeff Tinker
4e1fe736af Fix resource leaks in drm hal
bug:36408047
test: manual tests to verify leaks are fixed
Change-Id: Idd79e99e211d81f8b3e58cf52c9b01ce9d370dc4
2017-05-09 11:24:49 -07:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Steven Moreland
2cd0d42d72 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 10:17:28 -07:00
John W. Bruce
f3bffa8ef3 Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev am: 3fec5a6498
am: 3b361d8548

Change-Id: I717ef249e77045bb51a8d39fc20bf35850300f28
2017-04-29 00:01:51 +00:00
John W. Bruce
467c0db62c Prefix ENABLE_MEDIADRM_64 with TARGET_
This build-time flag should be prefixed.

Bug: 37039525
Test: Built OS
Change-Id: If6f6cd1ad2df5f000a4264cabeb7d9eb77e194ea
2017-04-27 18:50:05 -07:00
Jeff Tinker
3b65eae2fc Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev am: 1fd47b29b3
am: e126cf8cc1

Change-Id: I47ee7ecc392a88e0f4ac3ea570e5a55947be9f09
2017-04-25 22:18:06 +00:00
Jeff Tinker
a33256b811 Fix VtsHalDrmV1_0Target test failure
DrmHalVendorFactoryTest.EmptyPluginUUIDNotSupported
was failing on 64 bit builds. The test was using
an uninitialized hidl_array as the empty UUID which
was incorrect. This change initializes the array
contents to null values.

Test: drm hal tests pass

bug: 37172151
Change-Id: I0acb86921f0daceba30fa7879980ce819db64a74
2017-04-24 17:02:17 -07:00
Jeff Tinker
725771fdc4 Merge "VtsHalDrmV1_0Target test failure" into oc-dev am: c68698337c
am: bb68f35c9b

Change-Id: I05fd10acd902c70140a3acaec6096419f17159dc
2017-04-15 08:02:32 +00:00
TreeHugger Robot
c68698337c Merge "VtsHalDrmV1_0Target test failure" into oc-dev 2017-04-15 07:53:27 +00:00
Jeff Tinker
bb2223efe8 Merge "Skip tests when the drm scheme is not installed" into oc-dev am: fdde895c34
am: 09e8fb099d

Change-Id: I2f1ff0469264c3611ab6e19d3b69a3b9d9c0f659
2017-04-15 00:12:26 +00:00
Jeff Tinker
fdde895c34 Merge "Skip tests when the drm scheme is not installed" into oc-dev 2017-04-14 23:41:49 +00:00
Jeff Tinker
779678f559 VtsHalDrmV1_0Target test failure
The DrmHalVendorPluginTest.RestoreKeysClosedSession test wasn't
taking into account the policy of the asset, so both streaming
and offline assets were included in the test which is incorrect.

Test: drm vts test passes

bug:37358379
Change-Id: I41116e77a1ae306bb1a484e3714360c8553590f0
2017-04-14 16:13:19 -07:00
Ryan Campbell
d17815c4e3 Merge "Add testcases for restoreKeys API." into oc-dev am: 007d23e7cb
am: 3b1bb60add

Change-Id: I25d4d2a54ec29c1f44b5a5d020b33510939ca49b
2017-04-14 21:47:21 +00:00
TreeHugger Robot
007d23e7cb Merge "Add testcases for restoreKeys API." into oc-dev 2017-04-14 21:38:30 +00:00
Jeff Tinker
be310b2b77 Skip tests when the drm scheme is not installed
Not all drm hal implmentations will be present on every device,
but the vendor modules will be. This change allows tests to be skipped
when a drm hal implementation isn't present.

Test: drm vts tests pass with widevine on a gms
device (tests executed) and tests pass on an aosp
device (tests skipped).

Change-Id: I0b87f501a45103960193279eb5b4b2cd1c113acd
2017-04-14 13:28:32 -07:00
Iliyan Malchev
a5a5bce644 Merge "Route DRM HAL libbinder traffic to /dev/vndbinder" into oc-dev am: 580125c253
am: ef983f7ae1

Change-Id: Ic59d7d2d834814fdc3b7378155603b2537e2a357
2017-04-14 18:45:06 +00:00
Iliyan Malchev
136b5e46ec Route DRM HAL libbinder traffic to /dev/vndbinder
b/37309712
Test: marlin

Change-Id: I72c2304842bd21b5393c17be5beeeb90a74d5345
Signed-off-by: Iliyan Malchev <malchev@google.com>
2017-04-14 15:25:16 +00:00
Ryan Campbell
6799c3a5c5 Add testcases for restoreKeys API.
Add a positive and two negative test cases for the restoreKeys
function in DRM vendor plugin.

Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target
--primary-abi-only --skip-all-system-status-check
Bug: 34178477
Change-Id: Ia7f323dbd92e7281efa96b9b7d07b85123e819f4
2017-04-14 00:18:16 -07:00
Jeff Tinker
f783c20b0e Merge "DRM vts test bug fixes" into oc-dev am: ca7205fa61
am: 52ea2d0772

Change-Id: Ibe290e5ef25832b3c132c9406cc8ab238666a816
2017-04-13 18:17:56 +00:00
TreeHugger Robot
ca7205fa61 Merge "DRM vts test bug fixes" into oc-dev 2017-04-13 17:53:05 +00:00
Jeff Tinker
9dee7287e8 DRM vts test bug fixes
A session wasn't being closed in the ListenerKeysChange
test, that was causing erratic behavior on subsequent tests.
The expected return code was incorrect in the test
AttemptDecryptWithKeysRemoved.

bug:37272108
Change-Id: I11590b85c81548622359d91ebc9af75276a7b58c
2017-04-13 00:56:34 -07:00
Jeff Tinker
4c9339e2d1 Merge "Change drm/crypto service names to "default"" into oc-dev am: 8eb3a1ea59
am: 94c3beecfc

Change-Id: I004d1f2341ebac8b7876128602840772c6223197
2017-04-13 02:39:47 +00:00
TreeHugger Robot
8eb3a1ea59 Merge "Change drm/crypto service names to "default"" into oc-dev 2017-04-13 02:25:25 +00:00
Steven Moreland
d5bf55bd5a Merge changes from topic 'hidl-vendor-available' into oc-dev am: 17f0c0dde7
am: fce6b7f0d9

Change-Id: Ic95bee140e0bbbf094e89dcc7d0d99c30966786c
2017-04-12 22:54:17 +00:00
Jeff Tinker
a0b44e644a Change drm/crypto service names to "default"
bug: 36371166

Test: vts drm hidl test

Change-Id: Iae98708c4f9b58dc697fb54c9f9b67d99e7ed0cf
2017-04-11 16:25:15 -07:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Jeff Tinker
dc90103a3f Merge "Support binderized and passthrough vendor services" into oc-dev am: 25197f0f6f
am: 3d1a5c83ce

Change-Id: I3b5db2e5edef2b3359d529718d6feb8e94257e1d
2017-04-10 22:41:19 +00:00
TreeHugger Robot
25197f0f6f Merge "Support binderized and passthrough vendor services" into oc-dev 2017-04-10 22:14:20 +00:00
Jeff Tinker
bf064c8b31 Merge "Fix event listener timeout issues" into oc-dev am: 61fd056380
am: c7505938fa

Change-Id: I1b54ecc574169c0701d52840328eeffb266d6051
2017-04-10 18:34:22 +00:00
TreeHugger Robot
61fd056380 Merge "Fix event listener timeout issues" into oc-dev 2017-04-10 18:10:15 +00:00
Jeff Tinker
cf3916a1fd Support binderized and passthrough vendor services
Previously only the vendor service name was used
to get the drm and crypto services, which would work
either for binderized or passthrough devices, but not
both. With this change, the vendor service name is
tried first, and failing that the default passthrough
service is used.

Change-Id: I05e9552da992e8d9dbba0f8dde485406262410a9
related-to-bug:34178477
Test: drm vts test
2017-04-07 17:41:49 -07:00
TreeHugger Robot
04b10ccc41 Merge "Fix transitive includes." 2017-04-06 23:36:13 +00:00
Jeff Tinker
3da372af67 Fix event listener timeout issues
The drm vts event listener tests would hang if event
callouts failed to work as expected. Use the vts test
callback template instead.

Change-Id: I5234f5760d90c1e884badc25cd251da27c2c672d
related-to-bug:34178477
2017-04-06 16:09:02 -07:00
Steven Moreland
4e7a307730 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Merged-In: Iff316b21bef556bb026378b7f89e97ded3febef4
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 22:04:05 +00:00
Steven Moreland
3eb7df74b8 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 15:01:59 -07:00
TreeHugger Robot
69571ba233 Merge "Add additional drm hal tests" into oc-dev 2017-04-06 18:21:00 +00:00
Scott Randolph
f059ae420d Merge "Use explicit .c_str() for hidl_string" into oc-dev 2017-04-06 18:01:48 +00:00
TreeHugger Robot
7ba8df9b7c Merge "Correct comment on getProvisionRequest" into oc-dev 2017-04-06 15:37:51 +00:00
John W. Bruce
fcde9ff3a0 Add Flag for Enabling 64-bit Legacy DRM Plugins
We are ready for devices to begin migrating to a 64-bit Legacy DRM
Loader. However, not all devices are ready to make this jump yet. A
device needs to have all of its Legacy DRM Plugins ready to run as
64-bit before it can do this. This includes having 64-bit hardware
integrations.

So that devices can turn on 64-bit support as they get ready, I am
adding flags that can be set in a device's device.mk file. There are two
parts:

* ENABLE_MEDIADRM_64 enables building the Legacy DRM Plugin HAL as
  64-bit.

* Setting drm.64bit.enabled=true in PRODUCT_PROPERTY_OVERRIDES switches
  the Legacy DRM Plugin HAL to searching for DRM Plugins in the 64-bit
  directory.

Test: Validated that turning on these flags enables a 64-bit Legacy DRM
      Plugin HAL that loads 64-bit Legacy DRM Plugins from the lib64
      directory.
Bug: 36076017
Change-Id: I8d21fc7e7c0357eb6755839d41caa0f37ca20aff
2017-04-06 01:04:27 -07:00
Jeff Tinker
f20aa0c485 Add additional drm hal tests
Test: VTS tests passing

bug:34178477
Change-Id: Ie8fa5f2ad193b717b0564bb3046de8a64ccd8d85
2017-04-05 23:21:13 -07:00