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 
am: ddeab2c144

Change-Id: I06b840644f6e69015f972e7576d145b0898496c6
This commit is contained in:
Chih-Hung Hsieh
2018-12-20 17:37:53 -08:00
committed by android-build-merger
parent 477d3989d3 ddeab2c144
commit e053f576b1
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 {
public:
BitmapWrapper(Bitmap* bitmap)
explicit BitmapWrapper(Bitmap* bitmap)
: mBitmap(bitmap) { }
void freePixels() {

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

@@ -27,7 +27,7 @@ class FontFamily;
namespace android {
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;
};

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

@@ -21,7 +21,7 @@
class GIFMovie : public Movie {
public:
GIFMovie(SkStream* stream);
explicit GIFMovie(SkStream* stream);
virtual ~GIFMovie();
protected:

2
core/jni/fd_utils.cpp
View File

@@ -148,7 +148,7 @@ class FileDescriptorInfo {
const bool is_sock;
private:
FileDescriptorInfo(int fd);
explicit FileDescriptorInfo(int fd);
FileDescriptorInfo(struct stat stat, const std::string& file_path, int fd, int open_flags,
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);
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);