| 1e935c739f40cb8247a1f13c02996aaa8331229b |
|
28-Mar-2018 |
Jeff Tinker <jtinker@google.com> |
Fix clearkey return code for setSecurityLevel
When passing an invalid security level to
DrmPlugin::setSecurityLevel, an incorrect error code
was being returned, based on the drm@1.1 DrmPlugin.hal
documentation. This CL corrects the error code.
Change-Id: If560be07f3945320d28c42cb2cf18d8f8c718229
related-to-bug:73330999
bug:77308498
Test:VtsHalDrmV1_1Target
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 196f01061573d47096bcd2b6a7370f4f887c2444 |
|
21-Feb-2018 |
Edwin Wong <edwinwong@google.com> |
Implements secure stops API for clearkey 1.1 service.
Test: CTS tests
run cts-dev --module CtsMediaTestCases -t android.media.cts.MediaDrmClearkeyTest#testSecureStop
bug: 73085748
Change-Id: Iec16df13f2827c782fd3a8f7ea6f8c94789c7fca
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 3ee1ea26592fe75a09d1847ae18190ffc60fc85e |
|
13-Feb-2018 |
Edwin Wong <edwinwong@google.com> |
Fix getKeyRequest_1_1 using 1.0 callback.
getKeyRequest_1_1 was using 1.0 callback.
This fix creates a common function for both 1.0 and 1.1
getKeyRequest to call. The function now calls the version
appropriate callback to return key request data, key type
and default url.
Test: CTS ClearKeySystemTest#testClearKeyPlaybackCenc
Test: CTS ClearKeySystemTest#testGetProperties
Test: CTS ClearKeySystemTest#testSetProperties
Test: Verify getKeyRequest_1_1 is called
bug: 73085826
Change-Id: Id70a92862473540f5a4eb815892a69dfe1601b92
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 41d279a7f3bc55a63b510d4dce07e18964cda152 |
|
11-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Revert "Revert "Fix MediaDrm security level APIs""
This reverts commit 5f5e43fa83551a3636b92871bd2ad6b260a8815b.
Change-Id: I72d585fd3768730eef6ad9effdbda81b32418dea
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| c23849a8ea5d7e2939e9d8a0aa8b6da9c08ee625 |
|
11-Feb-2018 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Revert "Fix MediaDrm security level APIs""
|
| 5f5e43fa83551a3636b92871bd2ad6b260a8815b |
|
11-Feb-2018 |
Tobias Thierer <tobiast@google.com> |
Revert "Fix MediaDrm security level APIs"
This reverts commit 56134cc9e790f39b3b10a18b701b0607c20b6154.
Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.
https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log
Change-Id: I0de7738748ab793249df68bcbf18232d6a2d120a
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| fa84ada543c66b83e8328dc9bdf4982394fa4347 |
|
10-Feb-2018 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Fix MediaDrm security level APIs"
|
| 7a03cef5489d8b1482415df75cba6c6242df4e10 |
|
07-Feb-2018 |
Edwin Wong <edwinwong@google.com> |
kVersionValue in clearkey service 1.1 should return 1.1.
kVersionValue should return 1.1. Also change getPropertyString
to get value from mStringProperties[] instead of using hard coded
values.
Test: CTS ClearKeySystemTest#testGetProperties
bug: 73031837
Change-Id: I9d108a42a75ac3685d2c6ef58697efffe6152284
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 56134cc9e790f39b3b10a18b701b0607c20b6154 |
|
05-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Fix MediaDrm security level APIs
Vendors implementing the newly added MediaDrm.setSecurityLevel
HAL found that it was difficult to implement properly. Also the
semantics are somewhat ambiguous from the Java platform API
level. This CL binds the security level assignment to openSession
which clarifies the API for apps as well as making it more
natural to implement in HAL modules.
bug:72831697
bug:64001680
test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: Iaa07727be86ec2bc92be907d5a48c92136dc2014
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 27b25e1a9f4249633b56bc11bc311b0e6cd03102 |
|
01-Feb-2018 |
Adam Stone <blueeyes@google.com> |
Add getMetrics impl to ClearKey impl
Adds an implementation of getMetrics to the ClearKey implementation.
BUG: 69635855
Test: VtsHalDrmV1_1TargetTest
Change-Id: I3e01037081e8855e1dc9ff332c27edb8c79040df
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|
| 1917fac1e41f57e547df7dcdebf57dd8483e7f61 |
|
28-Dec-2017 |
Jeff Tinker <jtinker@google.com> |
Convert clearkey plugin to HIDL
Create clearkey HIDL service to support new APIs for drm 1.1 HAL.
The directories are organized into common, default and hidl.
The old shared library source is in common and default.
The new clearkey service source is in common and hidl.
Test: VtsHalDrmV1_1TargetTest
bug: 69635855
Change-Id: I2e8e0e1a39b622aa274ecd32c873d81b95bdc4f8
/frameworks/av/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp
|