summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-22 20:17:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 20:17:03 +0000
commit92b6cd8da9052e17710945604cd45098ebfb25e0 (patch)
tree73ff66c06401095bb8d9fc83f21a16e99a0165bc
parent3fcddfd23adc88116c8fe5ea593626bfce0b75bd (diff)
parent313358c747b54bbdcbff97636546e0304f6f4947 (diff)
downloadframeworks_av-92b6cd8da9052e17710945604cd45098ebfb25e0.zip
frameworks_av-92b6cd8da9052e17710945604cd45098ebfb25e0.tar.gz
frameworks_av-92b6cd8da9052e17710945604cd45098ebfb25e0.tar.bz2
GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838
am: 313358c747 * commit '313358c747b54bbdcbff97636546e0304f6f4947': 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 ccc11df..cdd2670 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -475,6 +475,7 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
{
Mutex::Autolock _l(mDisconnectLock);
mDataSource.clear();
+ mDecryptHandle = NULL;
mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();