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

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

Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052 

am: 99a3d72b

Change-Id: Icb12400292dae8ed091f1a55eb2f0a7e50e84667
parents d887e0f5 99a3d72b

libs/androidfw/AttributeResolution.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ class XmlAttributeFinder 
class BagAttributeFinder

class BagAttributeFinder

    : public BackTrackingAttributeFinder<BagAttributeFinder, const ResolvedBag::Entry*> {

    : public BackTrackingAttributeFinder<BagAttributeFinder, const ResolvedBag::Entry*> {

 public:

 public:

  BagAttributeFinder(const ResolvedBag* bag)

  explicit BagAttributeFinder(const ResolvedBag* bag)

      : BackTrackingAttributeFinder(bag != nullptr ? bag->entries : nullptr,

      : BackTrackingAttributeFinder(bag != nullptr ? bag->entries : nullptr,

                                    bag != nullptr ? bag->entries + bag->entry_count : nullptr) {

                                    bag != nullptr ? bag->entries + bag->entry_count : nullptr) {

  }

  }

libs/androidfw/ZipUtils.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ using namespace android; 
// TODO: This can go away once the only remaining usage in aapt goes away.

// TODO: This can go away once the only remaining usage in aapt goes away.

class FileReader : public zip_archive::Reader {

class FileReader : public zip_archive::Reader {

  public:

  public:

    FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) {

    explicit FileReader(FILE* fp) : Reader(), mFp(fp), mCurrentOffset(0) {

    }

    }





    bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const {

    bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const {

libs/androidfw/include/androidfw/AssetDir.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ private: 
    class FileInfo {

    class FileInfo {

    public:

    public:

        FileInfo(void) {}

        FileInfo(void) {}

        FileInfo(const String8& path)      // useful for e.g. svect.indexOf

        explicit FileInfo(const String8& path)      // useful for e.g. svect.indexOf

            : mFileName(path), mFileType(kFileTypeUnknown)

            : mFileName(path), mFileType(kFileTypeUnknown)

            {}

            {}

        ~FileInfo(void) {}

        ~FileInfo(void) {}

libs/androidfw/include/androidfw/BackupHelpers.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ struct FileRec { 
class BackupDataWriter

class BackupDataWriter

{

{

public:

public:

    BackupDataWriter(int fd);

    explicit BackupDataWriter(int fd);

    // does not close fd

    // does not close fd

    ~BackupDataWriter();

    ~BackupDataWriter();
@@ -104,7 +104,7 @@ private: 
class BackupDataReader

class BackupDataReader

{

{

public:

public:

    BackupDataReader(int fd);

    explicit BackupDataReader(int fd);

    // does not close fd

    // does not close fd

    ~BackupDataReader();

    ~BackupDataReader();

libs/androidfw/include/androidfw/ConfigDescription.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ struct ConfigDescription : public ResTable_config { 
  static void ApplyVersionForCompatibility(ConfigDescription* config);

  static void ApplyVersionForCompatibility(ConfigDescription* config);





  ConfigDescription();

  ConfigDescription();

  ConfigDescription(const android::ResTable_config& o);  // NOLINT(implicit)

  ConfigDescription(const android::ResTable_config& o);  // NOLINT(google-explicit-constructor)

  ConfigDescription(const ConfigDescription& o);

  ConfigDescription(const ConfigDescription& o);

  ConfigDescription(ConfigDescription&& o) noexcept;

  ConfigDescription(ConfigDescription&& o) noexcept;