commit e3b6ae14f520bec7dec5c9ef0198a0049631d2b1
author Jeff Tinker <jtinker@google.com> Tue May 16 18:21:39 2017 +0000
committer Jeff Tinker <jtinker@google.com> Tue May 16 18:21:39 2017 +0000
tree 21e106aa2dfe7962e8ca2589a061d830f08eface
parent 4e1fe736af1b88485bba762b11bc0c11a447819c

Revert "Fix resource leaks in drm hal"

This caused b/38343526 which is a chase list issue, reverting for now.

This reverts commit 4e1fe736af1b88485bba762b11bc0c11a447819c.

Change-Id: Ib9ffcd11e575e3f05f54cbea17fda2f2eb3780b5

drm/1.0/default/CryptoPlugin.h

diff --git a/drm/1.0/default/CryptoPlugin.h b/drm/1.0/default/CryptoPlugin.h
index 5da469c..11cc2aa 100644
--- a/drm/1.0/default/CryptoPlugin.h
+++ b/drm/1.0/default/CryptoPlugin.h
@@ -44,7 +44,7 @@
 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.

drm/1.0/default/DrmFactory.cpp

diff --git a/drm/1.0/default/DrmFactory.cpp b/drm/1.0/default/DrmFactory.cpp
index 05951d7..7e5d998 100644
--- a/drm/1.0/default/DrmFactory.cpp
+++ b/drm/1.0/default/DrmFactory.cpp
@@ -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

drm/1.0/default/DrmPlugin.cpp

diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp
index 1feec0a..1695ef7 100644
--- a/drm/1.0/default/DrmPlugin.cpp
+++ b/drm/1.0/default/DrmPlugin.cpp
@@ -327,27 +327,24 @@
 
     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 @@
         }
         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 @@
             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

drm/1.0/default/DrmPlugin.h

diff --git a/drm/1.0/default/DrmPlugin.h b/drm/1.0/default/DrmPlugin.h
index d951c92..dce6c0c 100644
--- a/drm/1.0/default/DrmPlugin.h
+++ b/drm/1.0/default/DrmPlugin.h
@@ -46,7 +46,7 @@
 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 @@
 
 private:
     android::DrmPlugin *mLegacyPlugin;
-    wp<IDrmPluginListener> mListener;
+    sp<IDrmPluginListener> mListener;
 
     DrmPlugin() = delete;
     DrmPlugin(const DrmPlugin &) = delete;