commit 3d3f67f3afa45e6b49d85b20942ee8184a33c1a4
author Jeff Tinker <jtinker@google.com> Wed Jul 03 15:38:58 2013 -0700
committer Jeff Tinker <jtinker@google.com> Wed Jul 03 16:23:39 2013 -0700
tree ecf87485ed6235279de2022c056c0f370b2af8d5
parent a691ff3c03e38e148bbefed35ebb15e552a12613

Part of fix for TEE resource leaks when app crashes

bug: 9672606
Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e

media/libmediaplayerservice/Drm.cpp

diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index 1e6cd94..f00f488 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -71,6 +71,12 @@
 status_t Drm::setListener(const sp<IDrmClient>& listener)
 {
     Mutex::Autolock lock(mEventLock);
+    if (mListener != NULL){
+        mListener->asBinder()->unlinkToDeath(this);
+    }
+    if (listener != NULL) {
+        listener->asBinder()->linkToDeath(this);
+    }
     mListener = listener;
     return NO_ERROR;
 }
@@ -576,4 +582,12 @@
     return mPlugin->verify(sessionId, keyId, message, signature, match);
 }
 
+void Drm::binderDied(const wp<IBinder> &the_late_who)
+{
+    delete mPlugin;
+    mPlugin = NULL;
+    closeFactory();
+    mListener.clear();
+}
+
 }  // namespace android