summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-22 11:35:04 -0700
committerWei Jia <wjia@google.com>2015-10-22 20:04:05 +0000
commit09c291c838bc74bb7c10c22f7232abb946cad8ff (patch)
treee58cf3da585391a370ef02ed7940c5e6d6149607
parent224858e719d045c8554856b12c4ab73d2375cf33 (diff)
downloadframeworks_av-09c291c838bc74bb7c10c22f7232abb946cad8ff.zip
frameworks_av-09c291c838bc74bb7c10c22f7232abb946cad8ff.tar.gz
frameworks_av-09c291c838bc74bb7c10c22f7232abb946cad8ff.tar.bz2
GenericSource: reset mDecryptHandle when mDataSource is cleared.
Bug: 25070434 Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484 (cherry picked from commit cdc9cf656a8e43875234cb021fffeb4792d7c74e)
-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();