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

Merge "Revert "Fix widevine drm hal resource leaks"" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-17 23:47:19 +00:00
committed by Android (Google) Code Review
parent 27deb32b79 d2080a8b9f
commit 45c98e47f2
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec; using ::android::hardware::hidl_vec;
using ::android::hardware::Return; using ::android::hardware::Return;
using ::android::sp; using ::android::sp;
using ::android::wp;
using android::status_t; using android::status_t;
using std::map; using std::map;
@@ -351,7 +350,7 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
sp<wvcdm::WvContentDecryptionModule> const mCDM; sp<wvcdm::WvContentDecryptionModule> const mCDM;
WVGenericCryptoInterface* mCrypto; WVGenericCryptoInterface* mCrypto;
map<CdmSessionId, CryptoSession> mCryptoSessions; map<CdmSessionId, CryptoSession> mCryptoSessions;
wp<IDrmPluginListener> mListener; sp<IDrmPluginListener> mListener;
status_t queryProperty(const std::string& property, status_t queryProperty(const std::string& property,
std::string& stringValue) const; std::string& stringValue) const;

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

@@ -1122,9 +1122,8 @@ Return<void> WVDrmPlugin::setListener(const sp<IDrmPluginListener>& listener) {
Return<void> WVDrmPlugin::sendEvent( Return<void> WVDrmPlugin::sendEvent(
EventType eventType, EventType eventType,
const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& data) { const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& data) {
auto listener = mListener.promote(); if (mListener != NULL) {
if (listener != NULL) { mListener->sendEvent(eventType, sessionId, data);
listener->sendEvent(eventType, sessionId, data);
} else { } else {
ALOGE("Null event listener, event not sent"); ALOGE("Null event listener, event not sent");
} }
@@ -1134,9 +1133,8 @@ Return<void> WVDrmPlugin::sendEvent(
Return<void> WVDrmPlugin::sendExpirationUpdate( Return<void> WVDrmPlugin::sendExpirationUpdate(
const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& sessionId,
int64_t expiryTimeInMS) { int64_t expiryTimeInMS) {
auto listener = mListener.promote(); if (mListener != NULL) {
if (listener != NULL) { mListener->sendExpirationUpdate(sessionId, expiryTimeInMS);
listener->sendExpirationUpdate(sessionId, expiryTimeInMS);
} else { } else {
ALOGE("Null event listener, event not sent"); ALOGE("Null event listener, event not sent");
} }
@@ -1146,9 +1144,8 @@ Return<void> WVDrmPlugin::sendExpirationUpdate(
Return<void> WVDrmPlugin::sendKeysChange( Return<void> WVDrmPlugin::sendKeysChange(
const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& sessionId,
const hidl_vec<KeyStatus>& keyStatusList, bool hasNewUsableKey) { const hidl_vec<KeyStatus>& keyStatusList, bool hasNewUsableKey) {
auto listener = mListener.promote(); if (mListener != NULL) {
if (listener != NULL) { mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
listener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
} else { } else {
ALOGE("Null event listener, event not sent"); ALOGE("Null event listener, event not sent");
} }