From d2080a8b9f860b88f0fc55dfd283c7c07c3904a2 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Tue, 16 May 2017 21:53:39 +0000
Subject: [PATCH] Revert "Fix widevine drm hal resource leaks"

This reverts commit 006506278a104bbf8edd1a3eb2c2de75094e6d91.

It needs to be reverted to fix b/38343960 on marlin.

This change is not needed since the root cause of the
resource leak was addressed in ag/2226738.

Change-Id: I93b64d39103d574b7dcde6b1477839a50b64aefd
---
 .../mediadrm/include_hidl/WVDrmPlugin.h           |  3 +--
 libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp  | 15 ++++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
index e14e3588..1aa89a46 100644
--- a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
+++ b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h
@@ -38,7 +38,6 @@ using ::android::hardware::hidl_string;
 using ::android::hardware::hidl_vec;
 using ::android::hardware::Return;
 using ::android::sp;
-using ::android::wp;
 
 using android::status_t;
 using std::map;
@@ -351,7 +350,7 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
   sp<wvcdm::WvContentDecryptionModule> const mCDM;
   WVGenericCryptoInterface* mCrypto;
   map<CdmSessionId, CryptoSession> mCryptoSessions;
-  wp<IDrmPluginListener> mListener;
+  sp<IDrmPluginListener> mListener;
 
   status_t queryProperty(const std::string& property,
                          std::string& stringValue) const;
diff --git a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
index 1dee072d..bcbe9903 100644
--- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
@@ -1122,9 +1122,8 @@ 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) {
-  auto listener = mListener.promote();
-  if (listener != NULL) {
-    listener->sendEvent(eventType, sessionId, data);
+  if (mListener != NULL) {
+    mListener->sendEvent(eventType, sessionId, data);
   } else {
     ALOGE("Null event listener, event not sent");
   }
@@ -1134,9 +1133,8 @@ Return<void> WVDrmPlugin::sendEvent(
 Return<void> WVDrmPlugin::sendExpirationUpdate(
      const hidl_vec<uint8_t>& sessionId,
      int64_t expiryTimeInMS) {
-  auto listener = mListener.promote();
-  if (listener != NULL) {
-    listener->sendExpirationUpdate(sessionId, expiryTimeInMS);
+  if (mListener != NULL) {
+    mListener->sendExpirationUpdate(sessionId, expiryTimeInMS);
   } else {
     ALOGE("Null event listener, event not sent");
   }
@@ -1146,9 +1144,8 @@ Return<void> WVDrmPlugin::sendExpirationUpdate(
 Return<void> WVDrmPlugin::sendKeysChange(
      const hidl_vec<uint8_t>& sessionId,
      const hidl_vec<KeyStatus>& keyStatusList, bool hasNewUsableKey) {
-  auto listener = mListener.promote();
-  if (listener != NULL) {
-    listener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
+  if (mListener != NULL) {
+    mListener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
   } else {
     ALOGE("Null event listener, event not sent");
   }