diff options
author | Wei Jia <wjia@google.com> | 2015-10-22 20:20:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 20:20:02 +0000 |
commit | 7b5564e251680275d810b5c34b5d9a3caebff0fb (patch) | |
tree | 73ff66c06401095bb8d9fc83f21a16e99a0165bc | |
parent | e01ba470525155c1c36e53d242a12a778069a5bc (diff) | |
parent | 92b6cd8da9052e17710945604cd45098ebfb25e0 (diff) | |
download | frameworks_av-7b5564e251680275d810b5c34b5d9a3caebff0fb.zip frameworks_av-7b5564e251680275d810b5c34b5d9a3caebff0fb.tar.gz frameworks_av-7b5564e251680275d810b5c34b5d9a3caebff0fb.tar.bz2 |
GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747
am: 92b6cd8da9
* commit '92b6cd8da9052e17710945604cd45098ebfb25e0':
GenericSource: reset mDecryptHandle when mDataSource is cleared.
-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 ccc11df..cdd2670 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(); + mDecryptHandle = NULL; mDrmManagerClient = NULL; mCachedSource.clear(); mHttpSource.clear(); |