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

Fix widevine drm hal resource leaks

Browse Source 
A strong pointer cycle was preventing the drm plugin
from being released.  This change converts the listener
to a weak pointer to break the cycle.

bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: I2e2af392c2b263b7b0943d61dcaee5e94089ce27
This commit is contained in:
Jeff Tinker
2017-05-09 14:31:07 -07:00
parent 35fc4edc11
commit 006506278a
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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