commit c0d8c35a2d3873ef1d7c7e5c5eaa51f41c1c3a17
author Ian Pedowitz <ijpedowitz@google.com> Thu Oct 22 02:06:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 02:06:29 2015 +0000
tree bff1acf02687c2f90a847f9acc8ab99c683ca445
parent 301a55c1152949f6c06247a2044f98cd150fcfde
parent 5adc76c49a525993f3362cf648864fb21f4547f0

Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." into mnc-dr-dev

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();
             }