widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev

Browse Source 
am: 83068b97c8

Change-Id: I3b1ce56a4960b64b9b4ac51a0e8479240cd1ec4a
This commit is contained in:
Jeff Tinker
2019-05-08 10:49:52 -07:00
committed by android-build-merger
parent e36786cca8 83068b97c8
commit 85590f243e
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/include_hidl/HidlTypes.h
View File

@@ -56,6 +56,7 @@ using drm::V1_2::KeySetId;
using drm::V1_2::OfflineLicenseState;
typedef drm::V1_1::KeyRequestType KeyRequestType_V1_1;
typedef drm::V1_2::KeyStatus KeyStatus_V1_2;
typedef drm::V1_2::IDrmPluginListener IDrmPluginListener_V1_2;
typedef drm::V1_2::Status Status_V1_2;
typedef drm::V1_2::HdcpLevel HdcpLevel_V1_2;

5
libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
View File

@@ -212,6 +212,11 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
const hidl_vec<KeyStatus>& keyStatusList,
bool hasNewUsableKey) override;
Return<void> sendKeysChange_1_2(
const hidl_vec<uint8_t>& sessionId,
const hidl_vec<KeyStatus_V1_2>& keyStatusList,
bool hasNewUsableKey) override;
Return<void> sendSessionLostState(
const hidl_vec<uint8_t>& sessionId) override;

11
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -1786,6 +1786,17 @@ Return<void> WVDrmPlugin::sendKeysChange(
return Void();
}
Return<void> WVDrmPlugin::sendKeysChange_1_2(
const hidl_vec<uint8_t>& sessionId,
const hidl_vec<KeyStatus_V1_2>& keyStatusList, bool hasNewUsableKey) {
if (mListenerV1_2 != NULL) {
mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey);
} else {
ALOGE("Null event listener, event not sent");
}
return Void();
}
Return<void> WVDrmPlugin::sendSessionLostState(
const hidl_vec<uint8_t>& sessionId) {
if (mListenerV1_2 != NULL) {