Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Tinker
2017-05-16 18:25:50 +00:00
committed by Android (Google) Code Review
parent 1d619f743d e3b6ae14f5
commit db15c4b6ee
4 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drm/1.0/default/CryptoPlugin.h
View File

@@ -44,7 +44,7 @@ using ::android::sp;
struct CryptoPlugin : public ICryptoPlugin {
CryptoPlugin(android::CryptoPlugin *plugin) : mLegacyPlugin(plugin) {}
virtual ~CryptoPlugin() {delete mLegacyPlugin;}
~CryptoPlugin() {delete mLegacyPlugin;}
// Methods from ::android::hardware::drm::V1_0::ICryptoPlugin
// follow.

2
drm/1.0/default/DrmFactory.cpp
View File

@@ -1,6 +1,6 @@
/*
* Copyright (C) 2016 The Android Open Source Project
*
` *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at

36
drm/1.0/default/DrmPlugin.cpp
View File

@@ -327,27 +327,24 @@ namespace implementation {
Return<void> DrmPlugin::sendEvent(EventType eventType,
const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& data) {
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendEvent(eventType, sessionId, data);
if (mListener != nullptr) {
mListener->sendEvent(eventType, sessionId, data);
}
return Void();
}
Return<void> DrmPlugin::sendExpirationUpdate(
const hidl_vec<uint8_t>& sessionId, int64_t expiryTimeInMS) {
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendExpirationUpdate(sessionId, expiryTimeInMS);
if (mListener != nullptr) {
mListener->sendExpirationUpdate(sessionId, expiryTimeInMS);
}
return Void();
}
Return<void> DrmPlugin::sendKeysChange(const hidl_vec<uint8_t>& sessionId,
const hidl_vec<KeyStatus>& keyStatusList, bool hasNewUsableKey) {
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
if (mListener != nullptr) {
mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
}
return Void();
}
@@ -383,21 +380,15 @@ namespace implementation {
}
if (sendEvent) {
Vector<uint8_t> emptyVector;
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendEvent(eventType,
toHidlVec(sessionId == NULL ? emptyVector: *sessionId),
toHidlVec(data == NULL ? emptyVector: *data));
}
mListener->sendEvent(eventType,
toHidlVec(sessionId == NULL ? emptyVector: *sessionId),
toHidlVec(data == NULL ? emptyVector: *data));
}
}
void DrmPlugin::sendExpirationUpdate(Vector<uint8_t> const *sessionId,
int64_t expiryTimeInMS) {
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendExpirationUpdate(toHidlVec(*sessionId), expiryTimeInMS);
}
mListener->sendExpirationUpdate(toHidlVec(*sessionId), expiryTimeInMS);
}
void DrmPlugin::sendKeysChange(Vector<uint8_t> const *sessionId,
@@ -433,11 +424,8 @@ namespace implementation {
keyStatus.keyId = toHidlVec(legacyKeyStatus.mKeyId);
keyStatusVec.push_back(keyStatus);
}
auto listener = mListener.promote();
if (listener != nullptr) {
listener->sendKeysChange(toHidlVec(*sessionId),
toHidlVec(keyStatusVec), hasNewUsableKey);
}
mListener->sendKeysChange(toHidlVec(*sessionId),
toHidlVec(keyStatusVec), hasNewUsableKey);
}
} // namespace implementation

4
drm/1.0/default/DrmPlugin.h
View File

@@ -46,7 +46,7 @@ using ::android::sp;
struct DrmPlugin : public IDrmPlugin, android::DrmPluginListener {
DrmPlugin(android::DrmPlugin *plugin) : mLegacyPlugin(plugin) {}
virtual ~DrmPlugin() {delete mLegacyPlugin;}
~DrmPlugin() {delete mLegacyPlugin;}
// Methods from ::android::hardware::drm::V1_0::IDrmPlugin follow.
@@ -153,7 +153,7 @@ struct DrmPlugin : public IDrmPlugin, android::DrmPluginListener {
private:
android::DrmPlugin *mLegacyPlugin;
wp<IDrmPluginListener> mListener;
sp<IDrmPluginListener> mListener;
DrmPlugin() = delete;
DrmPlugin(const DrmPlugin &) = delete;