summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-21 20:48:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 20:48:41 +0000
commite01ba470525155c1c36e53d242a12a778069a5bc (patch)
tree28331f56a33d25a0a9b019baf0c0112cb5e5fbae
parent8e4f53159c64996e1617ec589977c290fa233010 (diff)
parent3fcddfd23adc88116c8fe5ea593626bfce0b75bd (diff)
downloadframeworks_av-e01ba470525155c1c36e53d242a12a778069a5bc.zip
frameworks_av-e01ba470525155c1c36e53d242a12a778069a5bc.tar.gz
frameworks_av-e01ba470525155c1c36e53d242a12a778069a5bc.tar.bz2
GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7
am: 3fcddfd23a * commit '3fcddfd23adc88116c8fe5ea593626bfce0b75bd': GenericSource: reset mDrmManagerClient 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 e4cd338..ccc11df 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();
+ mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();
}