| commit | ea21ebc8b540fb108727f4fddfffe2923fdc416f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 01 23:07:04 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 01 23:07:05 2017 +0000 |
| tree | 02ea22e2172a4b2c8477eff9148aff5a8f097f20 | |
| parent | 5d6ebe53418ae8783ac295a8753e287fbb187868 [diff] | |
| parent | 3e2891674ef57a74e59ca5e27f89647b3f06861b [diff] |
Merge "Allow drm plugin to be released when binder dies" into oc-dev
diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp index e1718eb..e56f675 100644 --- a/drm/libmediadrm/DrmHal.cpp +++ b/drm/libmediadrm/DrmHal.cpp
@@ -958,11 +958,9 @@ void DrmHal::binderDied(const wp<IBinder> &the_late_who __unused) { - mEventLock.lock(); - mListener.clear(); - mEventLock.unlock(); - Mutex::Autolock autoLock(mLock); + setListener(NULL); + mPlugin->setListener(NULL); mPlugin.clear(); }