summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-22 23:37:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 23:37:42 +0000
commitfd72a5b9e1b7d36d8afb116b8e08c28ad444c188 (patch)
treeefba41c92e0e58ebd643dbe672147c879ac014a3
parentddb3d77dad1766708fdb18cc48e60a663ee8e2e1 (diff)
parent000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2 (diff)
downloadframeworks_av-fd72a5b9e1b7d36d8afb116b8e08c28ad444c188.zip
frameworks_av-fd72a5b9e1b7d36d8afb116b8e08c28ad444c188.tar.gz
frameworks_av-fd72a5b9e1b7d36d8afb116b8e08c28ad444c188.tar.bz2
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.
-rw-r--r--media/libmediaplayerservice/nuplayer/GenericSource.cpp1
1 files changed, 1 insertions, 0 deletions
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 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
{
Mutex::Autolock _l(mDisconnectLock);
mDataSource.clear();
+ mDecryptHandle = NULL;
mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();