commit ddb3d77dad1766708fdb18cc48e60a663ee8e2e1
author Wei Jia <wjia@google.com> Wed Oct 21 20:54:52 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 20:54:52 2015 +0000
tree c6191d8c23c247095d1b2857e48e9072e592382f
parent e20b0eb88c7593c13105b47ce383113fad247d85
parent adadada4f00eaf44bbc616be7a7d30010750560e

GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052
am: adadada4f0

* commit 'adadada4f00eaf44bbc616be7a7d30010750560e':
  GenericSource: reset mDrmManagerClient when mDataSource is cleared.

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index b3eb5fd..42fcb5b 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -474,6 +474,7 @@
             {
                 Mutex::Autolock _l(mDisconnectLock);
                 mDataSource.clear();
+                mDrmManagerClient = NULL;
                 mCachedSource.clear();
                 mHttpSource.clear();
             }