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

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

Browse Source 
am: 2e2028aee4

Change-Id: I27d1a114816f6ce94751816f7d17720e0a6d8091
This commit is contained in:
Chih-Hung Hsieh
2018-12-20 22:09:53 -08:00
committed by android-build-merger
parent 4d07d9d1e7 2e2028aee4
commit 4e628bc772
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/renderthread/CacheManager.h
View File

@@ -59,7 +59,7 @@ public:
private: private:
friend class RenderThread; friend class RenderThread;
CacheManager(const DisplayInfo& display); explicit CacheManager(const DisplayInfo& display);
void reset(sk_sp<GrContext> grContext); void reset(sk_sp<GrContext> grContext);
void destroy(); void destroy();

1
libs/hwui/renderthread/VulkanManager.h
View File

@@ -127,6 +127,7 @@ private:
fPtr = ptr; fPtr = ptr;
return *this; return *this;
} }
// NOLINTNEXTLINE(google-explicit-constructor)
operator FNPTR_TYPE() const { return fPtr; } operator FNPTR_TYPE() const { return fPtr; }
private: private: