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

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

Merge "Fix/suppress renderthread google-explicit-constructor warnings" 

am: 138aae8e

Change-Id: I8205f774fc3910ee63a60c92d330eaff6f649982
parents ba764da4 138aae8e

libs/hwui/renderthread/CacheManager.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 
private:

    friend class RenderThread;



    CacheManager(const DisplayInfo& display);

    explicit CacheManager(const DisplayInfo& display);



    void reset(sk_sp<GrContext> grContext);

    void destroy();

libs/hwui/renderthread/VulkanManager.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ private: 
            fPtr = ptr;

            return *this;

        }

        // NOLINTNEXTLINE(google-explicit-constructor)

        operator FNPTR_TYPE() const { return fPtr; }



    private: