commit 000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2
author Wei Jia <wjia@google.com> Thu Oct 22 20:22:26 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 20:22:26 2015 +0000
tree 6112019db06f1b36ecaaffb6c0033d3619ef0a6b
parent adadada4f00eaf44bbc616be7a7d30010750560e
parent 7b5564e251680275d810b5c34b5d9a3caebff0fb

GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9
am: 7b5564e251

* commit '7b5564e251680275d810b5c34b5d9a3caebff0fb':
  GenericSource: reset mDecryptHandle when mDataSource is cleared.

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index ccc11df..cdd2670 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -475,6 +475,7 @@
             {
                 Mutex::Autolock _l(mDisconnectLock);
                 mDataSource.clear();
+                mDecryptHandle = NULL;
                 mDrmManagerClient = NULL;
                 mCachedSource.clear();
                 mHttpSource.clear();