summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-21 20:54:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 20:54:52 +0000
commitddb3d77dad1766708fdb18cc48e60a663ee8e2e1 (patch)
treec6191d8c23c247095d1b2857e48e9072e592382f /media
parente20b0eb88c7593c13105b47ce383113fad247d85 (diff)
parentadadada4f00eaf44bbc616be7a7d30010750560e (diff)
downloadframeworks_av-ddb3d77dad1766708fdb18cc48e60a663ee8e2e1.zip
frameworks_av-ddb3d77dad1766708fdb18cc48e60a663ee8e2e1.tar.gz
frameworks_av-ddb3d77dad1766708fdb18cc48e60a663ee8e2e1.tar.bz2
GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052
am: adadada4f0 * commit 'adadada4f00eaf44bbc616be7a7d30010750560e': GenericSource: reset mDrmManagerClient when mDataSource is cleared.
Diffstat (limited to 'media')
-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 b3eb5fd..42fcb5b 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -474,6 +474,7 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
{
Mutex::Autolock _l(mDisconnectLock);
mDataSource.clear();
+ mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();
}