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

hidl plugin: add sendKeysChange_1_2

Browse Source 
Bug: 116738851
Test: vts
Change-Id: Ifdf537ff2f4922741eba5abdd37dd2dd5e37e161
This commit is contained in:
Robert Shih
2019-05-06 20:20:45 -07:00
parent a1e94e2eb1
commit a1d9094721
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; using drm::V1_2::OfflineLicenseState;
typedef drm::V1_1::KeyRequestType KeyRequestType_V1_1; 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::IDrmPluginListener IDrmPluginListener_V1_2;
typedef drm::V1_2::Status Status_V1_2; typedef drm::V1_2::Status Status_V1_2;
typedef drm::V1_2::HdcpLevel HdcpLevel_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, const hidl_vec<KeyStatus>& keyStatusList,
bool hasNewUsableKey) override; 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( Return<void> sendSessionLostState(
const hidl_vec<uint8_t>& sessionId) override; 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();
} }
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( Return<void> WVDrmPlugin::sendSessionLostState(
const hidl_vec<uint8_t>& sessionId) { const hidl_vec<uint8_t>& sessionId) {
if (mListenerV1_2 != NULL) { if (mListenerV1_2 != NULL) {