Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix google-explicit-constructor warnings in media utils."

Browse Source 
am: 5e91082b3c

Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
This commit is contained in:
Chih-hung Hsieh
2016-09-10 17:15:05 +00:00
committed by android-build-merger
parent da9a9da520 5e91082b3c
commit d1dd5ae76b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/jni/android_media_Utils.h
View File

@@ -37,7 +37,7 @@ private:
size_t mPosition; size_t mPosition;
public: public:
AssetStream(SkStream* stream); explicit AssetStream(SkStream* stream);
~AssetStream(); ~AssetStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -60,7 +60,7 @@ private:
const size_t kMinSizeToRead = 8192; const size_t kMinSizeToRead = 8192;
public: public:
BufferedStream(SkStream* stream); explicit BufferedStream(SkStream* stream);
~BufferedStream(); ~BufferedStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -79,8 +79,8 @@ private:
size_t mPosition; size_t mPosition;
public: public:
FileStream(const int fd); explicit FileStream(const int fd);
FileStream(const String8 filename); explicit FileStream(const String8 filename);
~FileStream(); ~FileStream();
// Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer