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

Commit 90bfeeef authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress core/jni google-explicit-constructor warnings" am: ddeab2c1 am: e053f576 

am: a13a9ee3

Change-Id: I48005e97647a95843bd0fd14701493717fa798bb
parents cee3e829 a13a9ee3

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ namespace android { 




class BitmapWrapper {

class BitmapWrapper {

public:

public:

    BitmapWrapper(Bitmap* bitmap)

    explicit BitmapWrapper(Bitmap* bitmap)

        : mBitmap(bitmap) { }

        : mBitmap(bitmap) { }





    void freePixels() {

    void freePixels() {

core/jni/android/graphics/FontUtils.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ class FontFamily; 
namespace android {

namespace android {





struct FontFamilyWrapper {

struct FontFamilyWrapper {

  FontFamilyWrapper(std::shared_ptr<minikin::FontFamily>&& family) : family(family) {}

  explicit FontFamilyWrapper(std::shared_ptr<minikin::FontFamily>&& family) : family(family) {}

  std::shared_ptr<minikin::FontFamily> family;

  std::shared_ptr<minikin::FontFamily> family;

};

};

core/jni/android/graphics/GIFMovie.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 




class GIFMovie : public Movie {

class GIFMovie : public Movie {

public:

public:

    GIFMovie(SkStream* stream);

    explicit GIFMovie(SkStream* stream);

    virtual ~GIFMovie();

    virtual ~GIFMovie();





protected:

protected:

core/jni/fd_utils.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ class FileDescriptorInfo { 
  const bool is_sock;

  const bool is_sock;





 private:

 private:

  FileDescriptorInfo(int fd);

  explicit FileDescriptorInfo(int fd);





  FileDescriptorInfo(struct stat stat, const std::string& file_path, int fd, int open_flags,

  FileDescriptorInfo(struct stat stat, const std::string& file_path, int fd, int open_flags,

                     int fd_flags, int fs_flags, off_t offset);

                     int fd_flags, int fs_flags, off_t offset);

core/jni/fd_utils.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ class FileDescriptorTable { 
  bool ReopenOrDetach(std::string* error_msg);

  bool ReopenOrDetach(std::string* error_msg);





 private:

 private:

  FileDescriptorTable(const std::unordered_map<int, FileDescriptorInfo*>& map);

  explicit FileDescriptorTable(const std::unordered_map<int, FileDescriptorInfo*>& map);





  bool RestatInternal(std::set<int>& open_fds, std::string* error_msg);

  bool RestatInternal(std::set<int>& open_fds, std::string* error_msg);