This CL undoes the merge cc28abea0b by
TreeHugger that should not have gone to master. We re-enable a unit
tests that is required for OC MR1, but is not required for OC.
It also includes a minor change that allows the oemcrypto mock to be
built by an Android NDK:
Merge from Widevine repo of http://go/wvgerrit/24681
b/31458046
b/35141278
Change-Id: I8edc51504a16f1825ef765aeaff6f77f034f0362
[ 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
To test restoreKeys, a content configuration with a
license policy allowing offline playaback was needed.
Test: drm vts test
bug:34178477
Change-Id: Ib90d7a878c0f310569abb09f21138c7a6ac9daae
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
[ 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
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
[ 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
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
(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
Part of VTS test suite validation for
the binderized Widevine service
Test: Drm VTS test
bug:32815560
Change-Id: I0913c0e72487b5fdbf579b9ea3409c13264888fd
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
