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

Merge "Fix/suppress core/jni google-explicit-constructor warnings"

Browse Source
This commit is contained in:
Treehugger Robot
2018-12-21 01:26:17 +00:00
committed by Gerrit Code Review
parent 00baab3d29 0727be1706
commit ddeab2c144
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/Bitmap.cpp
View File

@@ -48,7 +48,7 @@ namespace android {
class BitmapWrapper { class BitmapWrapper {
public: public:
BitmapWrapper(Bitmap* bitmap) explicit BitmapWrapper(Bitmap* bitmap)
: mBitmap(bitmap) { } : mBitmap(bitmap) { }
void freePixels() { void freePixels() {

2
core/jni/android/graphics/FontUtils.h
View File

@@ -27,7 +27,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;
}; };

2
core/jni/android/graphics/GIFMovie.cpp
View File

@@ -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:

2
core/jni/fd_utils.cpp
View File

@@ -148,7 +148,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);

2
core/jni/fd_utils.h
View File

@@ -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);