widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,142 Commits 2 Branches 0 Tags
1e9fe59e9ce19fd0530ab35445ea30f94f53f115
Commit Graph

2142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
1e9fe59e9c Merge "Translate CDM session not opened errors" into oc-dev am: 6116fdb97a 
am: 5ea9fc8cb4

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

Change-Id: I14d0507d1247ab9c72c1829af1fec298638fbac8
 2017-04-14 21:47:22 +00:00
Jeff Tinker
5ea9fc8cb4 Merge "Translate CDM session not opened errors" into oc-dev 
am: 6116fdb97a

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

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

Change-Id: I5c734f0d04c7464cc41da6c546e730d530765c16
 2017-04-14 18:45:10 +00:00
Iliyan Malchev
22169f63e8 Route drm@1.0-service.widevine libbinder to /dev/vndbinder 
am: 28b89a9b4f

Change-Id: I7dd7634546dd780a34423e48be47807030e9b90a
 2017-04-14 18:25:12 +00: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

Change-Id: I53b2457631663a9f55ae904fb770fdc564f31fd3
 2017-04-14 01:03:06 +00:00
Jeff Tinker
a40302e208 Merge "Corrections to widevine plugin for vts tests" into oc-dev 
am: c3ea64aa89

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

Change-Id: I4f28c30b7855d6fa394cf406af01b17e1740b4f6
 2017-04-13 01:36:15 +00:00
Rahul Frias
8b0edd6481 Correct error returned when license is for the future 
am: ce62e1d7e7

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

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

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

Change-Id: I9b6e0655278407cb1aa8b8bf6f2de7b94b68794d
 2017-04-12 01:47:04 +00:00
Fred Gylys-Colwell
4c5ae08575 Merge "Disable MinVersionNumber13 Test *DO NOT MERGE*" into oc-dev 
am: cc28abea0b

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

Change-Id: I8ea37fe2f027886252f2bed9b525a7c69de261b0
 2017-04-12 00:38:41 +00:00
Fred Gylys-Colwell
565d911792 Merge "Address merge comments" into oc-dev 
am: dbaacf9232

Change-Id: Ia8f793fa61b98aa8391468808fa5b75b5ff7c1c1
 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
Jeff Tinker
158769ce28 Merge "Report binderized vendor service name" into oc-dev am: eef94c002f 
am: 70d8036881

Change-Id: I506d0d71fa7ad54a6ac939800d78f322d17a18d0
 2017-04-11 21:28:54 +00:00
Jeff Tinker
ef9d80f562 Merge "Add checks for invalid parameters" into oc-dev am: 9a69579330 
am: c95756d367

Change-Id: I625efab0eaee64250dd040f8bec9a796fc68a18a
 2017-04-11 21:28:45 +00:00
Jeff Tinker
70d8036881 Merge "Report binderized vendor service name" into oc-dev 
am: eef94c002f

Change-Id: I7b0a17b2cb1328df14cf771ecd01908eb8e3a427
 2017-04-11 21:20:11 +00:00
Jeff Tinker
c95756d367 Merge "Add checks for invalid parameters" into oc-dev 
am: 9a69579330

Change-Id: Ic1c9fcb851e7c8ce7027ce620c9ac053f24a81b1
 2017-04-11 21:20:01 +00:00
TreeHugger Robot
eef94c002f Merge "Report binderized vendor service name" into oc-dev 2017-04-11 21:02:21 +00:00
TreeHugger Robot
9a69579330 Merge "Add checks for invalid parameters" into oc-dev 2017-04-11 21:01:25 +00:00
Fred Gylys-Colwell
f9d08a30a4 Disable MinVersionNumber13 Test *DO NOT MERGE* 
Merge from Widevine repo of http://go/wvgerrit/25662

OEMCrypto v13 is required for OC MR1, and is not needed for OC.  This
CL disables the unit tests MinVersionNumber13 for OC.  This CL should
not be merged to master.

b/36866361

Test: all unit tests pass on sailfish.

Change-Id: I04d7b468ac9479257c25519acb6ac13204acabd5
 2017-04-10 18:04:58 -07:00
John W. Bruce
7f27e5a266 Always Report OEMCrypto_ERROR_KEY_EXPIRED as NEED_KEY 
(This is a merge of wvgerrit/25422)

OEMCrypto_ERROR_KEY_EXPIRED was not always being reported to the higher
layers as a NEED_KEY error, which could cause inconsistent error
handling.

Bug: 28294273
Test: Unit tests
Change-Id: Idf5642ea0f0ba915bc1f53025a1f14691d142aed
 2017-04-10 16:49:44 -07:00
Jeff Tinker
bd87217173 Add checks for invalid parameters 
Part of VTS test suite validation for
the binderized Widevine service

Test: Drm VTS test

bug:32815560
Change-Id: I0913c0e72487b5fdbf579b9ea3409c13264888fd
 2017-04-10 10:06:26 -07:00
Jeff Tinker
dff3a13d6c Report binderized vendor service name 
Update the vts vendor module to
return the service name instead of the
default passthrough service name to
support binderized mode.

Part of VTS test suite validation for
the binderized Widevine service

Test: drm vts test

Change-Id: I04c9fa6f66af43db6c405ecc8d714b712d87a45a
related-to-bug:34178477
 2017-04-07 18:04:36 -07:00
Steven Moreland
64e0299a78 Fix transitive include. am: 20f8368f9c 
am: 2ab1579826

Change-Id: I1cb2875457b5cfd436182b369601908a9e30dfd6
 2017-04-07 03:38:17 +00:00
Steven Moreland
2ab1579826 Fix transitive include. 
am: 20f8368f9c

Change-Id: I649ec99177d7b21ce189bc5d132b3fbdb759cd5a
 2017-04-07 03:34:08 +00:00
Steven Moreland
20f8368f9c Fix transitive include. 
Test: checkbuild
Change-Id: Iea1de496007556d2efac76092ef87ec2ec78b9bf
 2017-04-06 17:39:39 -07:00
Jeff Tinker
bd6c2ddde1 Merge "Add additional VTS drm tests for widevine" into oc-dev am: 70d15e286f 
am: 26b8cac44e

Change-Id: I3a9ac7c3d857e594a87126bbef90c31f3721826e
 2017-04-06 20:12:31 +00:00
Scott Randolph
cfcb558328 Use explicit .c_str() for hidl_string am: cfcdceaa4f 
am: 6a7f774237

Change-Id: Id0b3e3e0b75df29c0ed89a38fef03ea7edaffe6c
 2017-04-06 20:10:06 +00:00
Jeff Tinker
26b8cac44e Merge "Add additional VTS drm tests for widevine" into oc-dev 
am: 70d15e286f

Change-Id: Id5c0ec26a22ca570932a571243bb552fe24fd898
 2017-04-06 18:30:16 +00:00
TreeHugger Robot
70d15e286f Merge "Add additional VTS drm tests for widevine" into oc-dev 2017-04-06 18:20:59 +00:00
Scott Randolph
6a7f774237 Use explicit .c_str() for hidl_string 
am: cfcdceaa4f

Change-Id: Ief21c8e31a1bbd3e389f70a0c9cfe0b837aece35
 2017-04-06 18:14:18 +00:00
Scott Randolph
cfcdceaa4f Use explicit .c_str() for hidl_string 
hidl_string no longer will provide an implicit cast to const char* as it
interfers with other expected behaviors of the class.  It now emulated
std::string in requiring a call to .c_str() to get the same behavior.

Bug:  36532780
Test:  Build the tree
Change-Id: I2ce4354619a99d7c5ae8b39762d5506891ccd1ed
 2017-04-06 10:58:56 -07:00
Edwin Wong
542ed59773 Merge "Remove dependencies from frameworks C++ containers." into oc-dev am: 72f89a3b7f 
am: c719a091fd

Change-Id: I85f0358f11cceb9b41d51bcbacb512adec097de5
 2017-04-06 04:25:30 +00:00
Edwin Wong
c719a091fd Merge "Remove dependencies from frameworks C++ containers." into oc-dev 
am: 72f89a3b7f

Change-Id: I3904d885c7e8cb45adb5ec3b57921533788871d1
 2017-04-06 04:21:57 +00:00
Edwin Wong
72f89a3b7f Merge "Remove dependencies from frameworks C++ containers." into oc-dev 2017-04-06 04:18:27 +00:00
Thierry Strudel
f94a1a6c43 service.widevine: Define LOCAL_MODULE_OWNER 
AOSP builds enforces that all vendor modules has a defined owner.

Change-Id: I7bb5d9e092b879cbce88a009f5f5d4b4d587e07d
Signed-off-by: Thierry Strudel <tstrudel@google.com>
 2017-04-05 21:17:58 -07:00