Merge "Fix/suppress renderthread google-explicit-constructor warnings" am: 138aae8eaf am: 2e2028aee4

am: 4e628bc772 Change-Id: I543de7a1c0e3429ca11addd60ae8300d8aedda29
2018-12-20 22:20:18 -08:00
parent 1c6f7f0e0a 4e628bc772
commit a640ed6058
2 changed files with 2 additions and 1 deletions
--- a/libs/hwui/renderthread/CacheManager.h
+++ b/libs/hwui/renderthread/CacheManager.h
@@ -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();
--- a/libs/hwui/renderthread/VulkanManager.h
+++ b/libs/hwui/renderthread/VulkanManager.h
@@ -160,6 +160,7 @@ private:
            fPtr = ptr;
            return *this;
        }
+        // NOLINTNEXTLINE(google-explicit-constructor)
        operator FNPTR_TYPE() const { return fPtr; }

    private: