diff options
| author | Wei Jia <wjia@google.com> | 2015-10-21 16:00:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-21 16:00:44 +0000 |
| commit | 7bfd9afefabd45d76e0cecb4f5c400958c867113 (patch) | |
| tree | 95521ace1df2f45bbb89101f93e768fc193d21a3 /media | |
| parent | bbe22fe075e7bbcec279ccb4c85f49ee00f7043b (diff) | |
| parent | b41fd0d4929f0a89811bafcc4fd944b128f00ce2 (diff) | |
| download | frameworks_av-7bfd9afefabd45d76e0cecb4f5c400958c867113.zip frameworks_av-7bfd9afefabd45d76e0cecb4f5c400958c867113.tar.gz frameworks_av-7bfd9afefabd45d76e0cecb4f5c400958c867113.tar.bz2 | |
Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 1 |
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(); } |