TreeHugger Robot
091d35e771
Merge "Undo bad merge"
2017-04-19 19:53:57 +00:00
Rahul Frias
3c971c8964
Merge "Allow OfflineLicenseRenewal test to be repeatedly invoked" into oc-dev am: 6260d4d628
...
am: 76e0c7b5d3
2017-04-19 18:27:28 +00:00
Rahul Frias
64de078bc0
Merge "Add usage information tests to device files unit tests" into oc-dev am: 3b68424d1f
...
am: f3c6cea6dc
2017-04-19 18:27:20 +00:00
Rahul Frias
76e0c7b5d3
Merge "Allow OfflineLicenseRenewal test to be repeatedly invoked" into oc-dev
...
am: 6260d4d628
2017-04-19 18:24:52 +00:00
Rahul Frias
f3c6cea6dc
Merge "Add usage information tests to device files unit tests" into oc-dev
...
am: 3b68424d1f
2017-04-19 18:24:38 +00:00
Rahul Frias
6260d4d628
Merge "Allow OfflineLicenseRenewal test to be repeatedly invoked" into oc-dev
2017-04-19 18:11:48 +00:00
Rahul Frias
3b68424d1f
Merge "Add usage information tests to device files unit tests" into oc-dev
2017-04-19 18:09:40 +00:00
Rahul Frias
f7c44ee4f7
Merge "Revert "Detect when unable to meet policy requirements"" into oc-dev am: 80798ae11c
...
am: 0f5f05f9cd
2017-04-18 20:56:39 +00:00
Rahul Frias
0f5f05f9cd
Merge "Revert "Detect when unable to meet policy requirements"" into oc-dev
...
am: 80798ae11c
2017-04-18 20:51:11 +00:00
Rahul Frias
80798ae11c
Merge "Revert "Detect when unable to meet policy requirements"" into oc-dev
2017-04-18 20:37:22 +00:00
Rahul Frias
e733943729
Revert "Detect when unable to meet policy requirements"
...
This reverts commit 1223330ccc
2017-04-18 20:03:56 +00:00
Rahul Frias
92ef632596
Merge "Detect when unable to meet policy requirements" into oc-dev am: 551f4cb474
...
am: 3bf36c4321
2017-04-15 06:58:33 +00:00
Rahul Frias
3bf36c4321
Merge "Detect when unable to meet policy requirements" into oc-dev
...
am: 551f4cb474
2017-04-15 06:55:54 +00:00
Rahul Frias
551f4cb474
Merge "Detect when unable to meet policy requirements" into oc-dev
2017-04-15 06:50:05 +00:00
Rahul Frias
66549ec1e1
Merge "Correct KeySetId value when returned by AddKey" into oc-dev am: f655f329e2
...
am: 16e76d3bb5
2017-04-15 06:43:32 +00:00
Rahul Frias
16e76d3bb5
Merge "Correct KeySetId value when returned by AddKey" into oc-dev
...
am: f655f329e2
2017-04-15 06:40:51 +00:00
Rahul Frias
f655f329e2
Merge "Correct KeySetId value when returned by AddKey" into oc-dev
2017-04-15 06:37:06 +00:00
Fred Gylys-Colwell
cab913f848
Undo bad merge
...
This CL undoes the merge cc28abea0bhttp://go/wvgerrit/24681
b/31458046
b/35141278
Change-Id: I8edc51504a16f1825ef765aeaff6f77f034f0362
2017-04-15 00:38:11 +00:00
Rahul Frias
57bb6c29ca
Add usage information tests to device files unit tests
...
[ Merge of http://go/wvgerrit/24445 ]
Test: Verified by wv unit and integration tests
b/36048120
Change-Id: I9d067e79654331e8e58df5dce5411fbadc73e575
2017-04-14 15:12:25 -07:00
Jeff Tinker
1e9fe59e9c
Merge "Translate CDM session not opened errors" into oc-dev am: 6116fdb97a
...
am: 5ea9fc8cb4
2017-04-14 21:47:23 +00:00
Jeff Tinker
11c9dc0b98
Merge "Add an offline test asset for the drm vts test" into oc-dev am: 45910edd19
...
am: b2e501c1e4
2017-04-14 21:47:22 +00:00
Jeff Tinker
5ea9fc8cb4
Merge "Translate CDM session not opened errors" into oc-dev
...
am: 6116fdb97a
2017-04-14 21:44:55 +00:00
Jeff Tinker
b2e501c1e4
Merge "Add an offline test asset for the drm vts test" into oc-dev
...
am: 45910edd19
2017-04-14 21:44:53 +00:00
TreeHugger Robot
6116fdb97a
Merge "Translate CDM session not opened errors" into oc-dev
2017-04-14 21:38:30 +00:00
TreeHugger Robot
45910edd19
Merge "Add an offline test asset for the drm vts test" into oc-dev
2017-04-14 21:38:30 +00:00
Iliyan Malchev
0591d7315e
Route drm@1.0-service.widevine libbinder to /dev/vndbinder am: 28b89a9b4f
...
am: 22169f63e8
2017-04-14 18:45:10 +00:00
Iliyan Malchev
22169f63e8
Route drm@1.0-service.widevine libbinder to /dev/vndbinder
...
am: 28b89a9b4f
2017-04-14 18:25:12 +00:00
Rahul Frias
5321b96623
Correct KeySetId value when returned by AddKey
...
[ Merge of http://go/wvgerrit/25643 ]
The MediaDrm#provideKeyResponse API states that an empty byte array is
returned when the license type is streaming or release but a non-empty
value was being returned in some cases.
The KeySetId is now returned when the license type is offline or when
the license is streaming and has a secure stop associated with it.
Test: Verified by request_license_test integration tests. Tests have been
modified to validate the returned Key Set Id values.
b/36093612
Change-Id: I82dba537c77ddd1d1876cbce58729f3db901ee51
2017-04-14 07:54:01 -07:00
Iliyan Malchev
28b89a9b4f
Route drm@1.0-service.widevine libbinder to /dev/vndbinder
...
b/37309712: [Marlin/Sailfish] Fatal signal 6 (SIGABRT) when playing Exo
Player L1 encrypted content
Test: marlin
Change-Id: I05b12ea334138498be13bca92c9b1db6ed1b9870
Signed-off-by: Iliyan Malchev <malchev@google.com >
2017-04-14 01:22:04 -07:00
Jeff Tinker
3914953bff
Add an offline test asset for the drm vts test
...
To test restoreKeys, a content configuration with a
license policy allowing offline playaback was needed.
Test: drm vts test
bug:34178477
Change-Id: Ib90d7a878c0f310569abb09f21138c7a6ac9daae
2017-04-14 00:30:07 -07:00
Jeff Tinker
f5240b69e4
Translate CDM session not opened errors
...
The drm hidl hal specifies that operations on sessions that
are not opened return ERROR_DRM_SESSION_NOT_OPENED. This
change adds that translation, previously they were mapped
to unknown error.
Test: drm vts test
bug:34178477
Change-Id: I3777dd90eea7061f3fa5413a5732d7d58b85b49b
2017-04-14 00:28:47 -07:00
Jeff Tinker
0c7a6a3f76
Merge "Corrections to widevine plugin for vts tests" into oc-dev am: c3ea64aa89
...
am: a40302e208
2017-04-14 01:03:06 +00:00
Jeff Tinker
a40302e208
Merge "Corrections to widevine plugin for vts tests" into oc-dev
...
am: c3ea64aa89
2017-04-14 00:12:28 +00:00
TreeHugger Robot
c3ea64aa89
Merge "Corrections to widevine plugin for vts tests" into oc-dev
2017-04-14 00:05:42 +00:00
Rahul Frias
1223330ccc
Detect when unable to meet policy requirements
...
[ Merge of http://go/wvgerrit/25781 ]
The security level (software/hardware, decryption/decode)
in the policy that specified how the key was to be used was
not being respected for L3. Playback would either continue or
a vendor specific error would be thrown.
If the device cannot use the key as permitted by the policy
CryptoException#ERROR_INSUFFICIENT_OUTPUT_PROTECTION will be thrown.
Test: Verified by WV unit+integration tests.
Verified by WidevineDashPolicyTests
Verified by WidevineDashPolicyTests#testL3SoftwareSecureDecoderRequired,
testL3HardwareSecureCryptoRequired, testL3HardwareSecureDecodeRequired,
testL3SecureVideoPathRequired.
b/31913737
b/31913439
Change-Id: Ibfc7f3dd6fc7264e8cf9b0d33f6f8d619eed6c00
2017-04-13 16:50:10 -07:00
Jeff Tinker
6c15ea673d
Corrections to widevine plugin for vts tests
...
Add a check for invalid session size in restoreKeys
and correct the return code when attempting to create a
plugin with an invalid uuid. Also correct the return code
when attempting to decrypt after keys have been removed.
bug:37172151
Change-Id: I7e832ffe04081471a0cdb3a9329808f47f12cfc3
2017-04-13 14:53:12 -07:00
Rahul Frias
4007f35a65
Correct error returned when license is for the future am: ce62e1d7e7
...
am: 8b0edd6481
2017-04-13 01:36:15 +00:00
Rahul Frias
8b0edd6481
Correct error returned when license is for the future
...
am: ce62e1d7e7
2017-04-13 01:29:54 +00:00
Rahul Frias
ce62e1d7e7
Correct error returned when license is for the future
...
[ Merge of http://go/wvgerrit/25721 ]
Return CryptoException with errorCode ERROR_NO_KEY when an attempt is made
to make use of a license whose start time is in the future.
Test: Verified by WidevineDashPolicyTests#testL1LicenseStart2030
b/31914841
Change-Id: I2a157c227550a2391b6536365f34f1dfec3dea0c
2017-04-12 13:20:44 -07:00
John Bruce
67650139cc
Merge "Always Report OEMCrypto_ERROR_KEY_EXPIRED as NEED_KEY" into oc-dev am: 1b0d67f368
...
am: d7d5715f21
2017-04-12 18:24:55 +00:00
John Bruce
d7d5715f21
Merge "Always Report OEMCrypto_ERROR_KEY_EXPIRED as NEED_KEY" into oc-dev
...
am: 1b0d67f368
2017-04-12 18:08:50 +00:00
John Bruce
1b0d67f368
Merge "Always Report OEMCrypto_ERROR_KEY_EXPIRED as NEED_KEY" into oc-dev
2017-04-12 17:48:58 +00:00
Fred Gylys-Colwell
f59fc8cb86
Merge "Disable MinVersionNumber13 Test *DO NOT MERGE*" into oc-dev am: cc28abea0b
...
am: 4c5ae08575
2017-04-12 01:47:04 +00:00
Fred Gylys-Colwell
4c5ae08575
Merge "Disable MinVersionNumber13 Test *DO NOT MERGE*" into oc-dev
...
am: cc28abea0b
2017-04-12 01:41:53 +00:00
TreeHugger Robot
cc28abea0b
Merge "Disable MinVersionNumber13 Test *DO NOT MERGE*" into oc-dev
2017-04-12 01:37:18 +00:00
Fred Gylys-Colwell
87040f8157
Merge "Address merge comments" into oc-dev am: dbaacf9232
...
am: 565d911792
2017-04-12 00:38:41 +00:00
Fred Gylys-Colwell
565d911792
Merge "Address merge comments" into oc-dev
...
am: dbaacf9232
2017-04-12 00:21:58 +00:00
TreeHugger Robot
dbaacf9232
Merge "Address merge comments" into oc-dev
2017-04-11 23:57:19 +00:00
Rahul Frias
b474ba042e
Allow OfflineLicenseRenewal test to be repeatedly invoked
...
[ Merge of http://go/wvgerrit/25720 ]
Test: Repeatedly invoke WvCdmRequestLicenseTest.OfflineLicenseRenewal
b/28915200
Change-Id: I5be6be02d09ced1a7ba8bac2c8706f199d063db8
2017-04-11 16:40:16 -07:00
Jeff Tinker
158769ce28
Merge "Report binderized vendor service name" into oc-dev am: eef94c002f
...
am: 70d8036881
2017-04-11 21:28:54 +00:00
