Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c

am: d1dd5ae76b

Change-Id: I71778eb5a253ebf5342f863d34e178513d386783

1 files changed, 4 insertions, 4 deletions

diff --git a/media/jni/android_media_Utils.h b/media/jni/android_media_Utils.h
index 8184f943ce23..39c155439767 100644
--- a/media/jni/android_media_Utils.h
+++ b/media/jni/android_media_Utils.h
@@ -37,7 +37,7 @@ private:
     size_t mPosition;
 
 public:
-    AssetStream(SkStream* stream);
+    explicit AssetStream(SkStream* stream);
     ~AssetStream();
 
     // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -60,7 +60,7 @@ private:
     const size_t kMinSizeToRead = 8192;
 
 public:
-    BufferedStream(SkStream* stream);
+    explicit BufferedStream(SkStream* stream);
     ~BufferedStream();
 
     // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer
@@ -79,8 +79,8 @@ private:
     size_t mPosition;
 
 public:
-    FileStream(const int fd);
-    FileStream(const String8 filename);
+    explicit FileStream(const int fd);
+    explicit FileStream(const String8 filename);
     ~FileStream();
 
     // Reads 'length' amount of bytes from 'offset' to 'data'. The 'data' buffer