commit fd72a5b9e1b7d36d8afb116b8e08c28ad444c188
author Wei Jia <wjia@google.com> Thu Oct 22 23:37:42 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 23:37:42 2015 +0000
tree efba41c92e0e58ebd643dbe672147c879ac014a3
parent ddb3d77dad1766708fdb18cc48e60a663ee8e2e1
parent 000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2

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

* commit '000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2':
  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 42fcb5b..45da218 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -474,6 +474,7 @@
             {
                 Mutex::Autolock _l(mDisconnectLock);
                 mDataSource.clear();
+                mDecryptHandle = NULL;
                 mDrmManagerClient = NULL;
                 mCachedSource.clear();
                 mHttpSource.clear();