summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-21 20:51:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 20:51:56 +0000
commitadadada4f00eaf44bbc616be7a7d30010750560e (patch)
treed5800551c89e2c4fa4e9ec90bbf3e38a2ae1a8fc /media
parent8fbf202f7b9fa461f07b49470c2a6afe39ca6afd (diff)
parente01ba470525155c1c36e53d242a12a778069a5bc (diff)
downloadframeworks_av-adadada4f00eaf44bbc616be7a7d30010750560e.zip
frameworks_av-adadada4f00eaf44bbc616be7a7d30010750560e.tar.gz
frameworks_av-adadada4f00eaf44bbc616be7a7d30010750560e.tar.bz2
GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a
am: e01ba47052 * commit 'e01ba470525155c1c36e53d242a12a778069a5bc': 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 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();
}