diff options
| author | Dave Weinstein <olorin@google.com> | 2016-06-14 11:05:01 -0700 |
|---|---|---|
| committer | Zach Jang <zachjang@google.com> | 2016-06-14 22:21:47 +0000 |
| commit | d112f7d0c1dbaf0368365885becb11ca8d3f13a4 (patch) | |
| tree | b719b6836ee243cb7ab78893df23b3be75d84de0 /media/libmediaplayerservice | |
| parent | f81038006b4c59a5a148dcad887371206033c28f (diff) | |
| download | frameworks_av-d112f7d0c1dbaf0368365885becb11ca8d3f13a4.zip frameworks_av-d112f7d0c1dbaf0368365885becb11ca8d3f13a4.tar.gz frameworks_av-d112f7d0c1dbaf0368365885becb11ca8d3f13a4.tar.bz2 | |
Resolve a merge issue between lmp and lmp-mr1+
Change-Id: I336cb003fb7f50fd7d95c30ca47e45530a7ad503
(cherry picked from commit 33f6da1092834f1e4be199cfa3b6310d66b521c0)
(cherry picked from commit bb3a0338b58fafb01ac5b34efc450b80747e71e4)
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 0598254..e8c28d5 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -324,7 +324,7 @@ int64_t NuPlayer::GenericSource::getLastReadPosition() { status_t NuPlayer::GenericSource::setBuffers( bool audio, Vector<MediaBuffer *> &buffers) { - if (mIsWidevine && !audio && mVideoTrack.mSource != NULL) { + if (mIsSecure && !audio && mVideoTrack.mSource != NULL) { return mVideoTrack.mSource->setBuffers(buffers); } return INVALID_OPERATION; |