summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-21 20:44:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 20:44:29 +0000
commit3fcddfd23adc88116c8fe5ea593626bfce0b75bd (patch)
tree28331f56a33d25a0a9b019baf0c0112cb5e5fbae
parent699e9b0749bda03d12d6aaea9632b28d2bd9e6fb (diff)
parent69c8e36da7137730f4789a0d27d983b40d1f2917 (diff)
downloadframeworks_av-3fcddfd23adc88116c8fe5ea593626bfce0b75bd.zip
frameworks_av-3fcddfd23adc88116c8fe5ea593626bfce0b75bd.tar.gz
frameworks_av-3fcddfd23adc88116c8fe5ea593626bfce0b75bd.tar.bz2
GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719
am: 69c8e36da7 * commit '69c8e36da7137730f4789a0d27d983b40d1f2917': 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();
}