commit adadada4f00eaf44bbc616be7a7d30010750560e
author Wei Jia <wjia@google.com> Wed Oct 21 20:51:56 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 20:51:56 2015 +0000
tree d5800551c89e2c4fa4e9ec90bbf3e38a2ae1a8fc
parent 8fbf202f7b9fa461f07b49470c2a6afe39ca6afd
parent e01ba470525155c1c36e53d242a12a778069a5bc

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

* commit 'e01ba470525155c1c36e53d242a12a778069a5bc':
  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 e4cd338..ccc11df 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -475,6 +475,7 @@
             {
                 Mutex::Autolock _l(mDisconnectLock);
                 mDataSource.clear();
+                mDrmManagerClient = NULL;
                 mCachedSource.clear();
                 mHttpSource.clear();
             }