summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-22 20:14:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 20:14:25 +0000
commit313358c747b54bbdcbff97636546e0304f6f4947 (patch)
treea190e5bef81500cb3896dc03e1876f2a2e93f590
parent69c8e36da7137730f4789a0d27d983b40d1f2917 (diff)
parent09c291c838bc74bb7c10c22f7232abb946cad8ff (diff)
downloadframeworks_av-313358c747b54bbdcbff97636546e0304f6f4947.zip
frameworks_av-313358c747b54bbdcbff97636546e0304f6f4947.tar.gz
frameworks_av-313358c747b54bbdcbff97636546e0304f6f4947.tar.bz2
GenericSource: reset mDecryptHandle when mDataSource is cleared.
am: 09c291c838 * commit '09c291c838bc74bb7c10c22f7232abb946cad8ff': 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 63d826c..b3efd74 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -381,6 +381,7 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
{
Mutex::Autolock _l(mDisconnectLock);
mDataSource.clear();
+ mDecryptHandle = NULL;
mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();