commit 3fcddfd23adc88116c8fe5ea593626bfce0b75bd
author Wei Jia <wjia@google.com> Wed Oct 21 20:44:29 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 20:44:29 2015 +0000
tree 28331f56a33d25a0a9b019baf0c0112cb5e5fbae
parent 699e9b0749bda03d12d6aaea9632b28d2bd9e6fb
parent 69c8e36da7137730f4789a0d27d983b40d1f2917

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

* commit '69c8e36da7137730f4789a0d27d983b40d1f2917':
  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();
             }