diff options
author | Jeff Tinker <jtinker@google.com> | 2013-07-07 12:26:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-07 12:26:16 -0700 |
commit | 9a25c012915f2209fff1479b246ae8eba38c3eff (patch) | |
tree | af538ebd502f0d834f5e9a10799f3e508bdfa55b /media | |
parent | ace2378c934b61fbd865b5ade9ff7d0df81dabe3 (diff) | |
parent | eced745af7d2d27a8c45e04eb071d4fb30cd3e48 (diff) | |
download | frameworks_av-9a25c012915f2209fff1479b246ae8eba38c3eff.zip frameworks_av-9a25c012915f2209fff1479b246ae8eba38c3eff.tar.gz frameworks_av-9a25c012915f2209fff1479b246ae8eba38c3eff.tar.bz2 |
am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
* commit 'eced745af7d2d27a8c45e04eb071d4fb30cd3e48':
Part of fix for TEE resource leaks when app crashes
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 14 | ||||
-rw-r--r-- | media/libmediaplayerservice/Drm.h | 6 |
2 files changed, 19 insertions, 1 deletions
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::initCheck() const { 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 @@ status_t Drm::verify(Vector<uint8_t> const &sessionId, 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 diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h index 3da8ad4..3f460f1 100644 --- a/media/libmediaplayerservice/Drm.h +++ b/media/libmediaplayerservice/Drm.h @@ -29,7 +29,9 @@ namespace android { struct DrmFactory; struct DrmPlugin; -struct Drm : public BnDrm, public DrmPluginListener { +struct Drm : public BnDrm, + public IBinder::DeathRecipient, + public DrmPluginListener { Drm(); virtual ~Drm(); @@ -115,6 +117,8 @@ struct Drm : public BnDrm, public DrmPluginListener { Vector<uint8_t> const *sessionId, Vector<uint8_t> const *data); + virtual void binderDied(const wp<IBinder> &the_late_who); + private: mutable Mutex mLock; |