diff options
| author | Patrik Lindgren <patrik2.lindgren@sonymobile.com> | 2014-12-22 09:06:21 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-01 15:27:23 -0800 |
| commit | f474d172dd6796e85f5a8b0ae4e28b946e0415cd (patch) | |
| tree | 1ab4c61c6948fa317206b39ea5a3b41e8b21aeb9 /include/media | |
| parent | bc585fb49598eaa9b5d6fd888519eb2873310599 (diff) | |
| download | frameworks_av-f474d172dd6796e85f5a8b0ae4e28b946e0415cd.zip frameworks_av-f474d172dd6796e85f5a8b0ae4e28b946e0415cd.tar.gz frameworks_av-f474d172dd6796e85f5a8b0ae4e28b946e0415cd.tar.bz2 | |
Handle error result from DrmManagerClient correctly
readAtDRM() must handle the case when DrmManagerClient::pread()
returns an error (-1) correctly. This is a degrade in Android L.
Change-Id: Id7ff124d178e26931dddac5ac73697cfe6da501c
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/FileSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h index 7051b20..f4f874f 100644 --- a/include/media/stagefright/FileSource.h +++ b/include/media/stagefright/FileSource.h @@ -61,7 +61,7 @@ private: sp<DecryptHandle> mDecryptHandle; DrmManagerClient *mDrmManagerClient; int64_t mDrmBufOffset; - size_t mDrmBufSize; + ssize_t mDrmBufSize; unsigned char *mDrmBuf; ssize_t readAtDRM(off64_t offset, void *data, size_t size); |