diff options
| author | Wei Jia <wjia@google.com> | 2015-10-22 20:02:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-22 20:02:55 +0000 |
| commit | f8dc643316bd2baf2d999c85a91dc8bf947427cc (patch) | |
| tree | 4feed72874a124c73ab98a1925178591351e4354 /media | |
| parent | 78c164c2386a24c6ea4455883a54acbbc20056e9 (diff) | |
| parent | cdc9cf656a8e43875234cb021fffeb4792d7c74e (diff) | |
| download | frameworks_av-f8dc643316bd2baf2d999c85a91dc8bf947427cc.zip frameworks_av-f8dc643316bd2baf2d999c85a91dc8bf947427cc.tar.gz frameworks_av-f8dc643316bd2baf2d999c85a91dc8bf947427cc.tar.bz2 | |
Merge "GenericSource: reset mDecryptHandle 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 42fcb5b..45da218 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(); + mDecryptHandle = NULL; mDrmManagerClient = NULL; mCachedSource.clear(); mHttpSource.clear(); |