Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68b9ebcd authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

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

am: d1dd5ae7

Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
parents c3041a5a d1dd5ae7
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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