summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-21 20:40:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-21 20:40:28 +0000
commit69c8e36da7137730f4789a0d27d983b40d1f2917 (patch)
treede99b5972719f53932136141fbc98b34ea5a752c
parentb44e95da772bb26fa9fc4cdc04cf51b7d42344ae (diff)
parent224858e719d045c8554856b12c4ab73d2375cf33 (diff)
downloadframeworks_av-69c8e36da7137730f4789a0d27d983b40d1f2917.zip
frameworks_av-69c8e36da7137730f4789a0d27d983b40d1f2917.tar.gz
frameworks_av-69c8e36da7137730f4789a0d27d983b40d1f2917.tar.bz2
GenericSource: reset mDrmManagerClient when mDataSource is cleared.
am: 224858e719 * commit '224858e719d045c8554856b12c4ab73d2375cf33': 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 b6f3a9f..63d826c 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();
+ mDrmManagerClient = NULL;
mCachedSource.clear();
mHttpSource.clear();
}