diff --git a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp index 1ef9916b..c1ddb155 100644 --- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp +++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp @@ -1787,27 +1787,35 @@ Return WVDrmPlugin::sendEvent( EventType eventType, const hidl_vec& sessionId, const hidl_vec& data) { + Return err{}; if (mListenerV1_2 != NULL) { - mListenerV1_2->sendEvent(eventType, sessionId, data); + err = mListenerV1_2->sendEvent(eventType, sessionId, data); } else if (mListener != NULL) { - mListener->sendEvent(eventType, sessionId, data); + err = mListener->sendEvent(eventType, sessionId, data); } else { ALOGE("Null event listener, event not sent"); } - return Void(); + if (!err.isOk()) { + ALOGW("sendEvent failed %s", err.description().c_str()); + } + return err; } Return WVDrmPlugin::sendExpirationUpdate( const hidl_vec& sessionId, int64_t expiryTimeInMS) { + Return err{}; if (mListenerV1_2 != NULL) { - mListenerV1_2->sendExpirationUpdate(sessionId, expiryTimeInMS); + err = mListenerV1_2->sendExpirationUpdate(sessionId, expiryTimeInMS); } else if (mListener != NULL) { - mListener->sendExpirationUpdate(sessionId, expiryTimeInMS); + err = mListener->sendExpirationUpdate(sessionId, expiryTimeInMS); } else { ALOGE("Null event listener, event not sent"); } - return Void(); + if (!err.isOk()) { + ALOGW("sendExpirationUpdate failed %s", err.description().c_str()); + } + return err; } template<> @@ -1815,7 +1823,10 @@ void WVDrmPlugin::_sendKeysChange( const hidl_vec& sessionId, const hidl_vec& keyStatusList, bool hasNewUsableKey) { - mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); + auto err = mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); + if (!err.isOk()) { + ALOGW("sendKeysChange failed %s", err.description().c_str()); + } } template<> @@ -1823,41 +1834,56 @@ void WVDrmPlugin::_sendKeysChange( const hidl_vec& sessionId, const hidl_vec& keyStatusList, bool hasNewUsableKey) { - mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey); + auto err = mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey); + if (!err.isOk()) { + ALOGW("sendKeysChange_1_2 failed %s", err.description().c_str()); + } } Return WVDrmPlugin::sendKeysChange( const hidl_vec& sessionId, const hidl_vec& keyStatusList, bool hasNewUsableKey) { + Return err{}; if (mListenerV1_2 != NULL) { - mListenerV1_2->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); + err = mListenerV1_2->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); } else if (mListener != NULL) { - mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); + err = mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey); } else { ALOGE("Null event listener, event not sent"); } - return Void(); + if (!err.isOk()) { + ALOGW("sendKeysChange failed %s", err.description().c_str()); + } + return err; } Return WVDrmPlugin::sendKeysChange_1_2( const hidl_vec& sessionId, const hidl_vec& keyStatusList, bool hasNewUsableKey) { + Return err{}; if (mListenerV1_2 != NULL) { - mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey); + err = mListenerV1_2->sendKeysChange_1_2(sessionId, keyStatusList, hasNewUsableKey); } else { ALOGE("Null event listener, event not sent"); } - return Void(); + if (!err.isOk()) { + ALOGW("sendKeysChange_1_2 failed %s", err.description().c_str()); + } + return err; } Return WVDrmPlugin::sendSessionLostState( const hidl_vec& sessionId) { + Return err{}; if (mListenerV1_2 != NULL) { - mListenerV1_2->sendSessionLostState(sessionId); + err = mListenerV1_2->sendSessionLostState(sessionId); } else { ALOGE("Null event listener, event not sent"); } - return Void(); + if (!err.isOk()) { + ALOGW("sendSessionLostState failed %s", err.description().c_str()); + } + return err; } void WVDrmPlugin::OnSessionRenewalNeeded(const CdmSessionId& cdmSessionId) {