Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."

2 files changed, 4 insertions, 3 deletions

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 3c774a3313d2..0ffd116236f5 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -234,13 +234,13 @@ void Caches::flush(FlushMode mode) {
             gradientCache.clear();
             fontRenderer.clear();
             fboCache.clear();
-        // fall through
+            [[fallthrough]];
         case FlushMode::Moderate:
             fontRenderer.flush();
             textureCache.flush();
             pathCache.clear();
             tessellationCache.clear();
-        // fall through
+            [[fallthrough]];
         case FlushMode::Layers:
             renderBufferCache.clear();
             break;
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index 270527d551a9..cb503593c6c8 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -331,7 +331,8 @@ sk_sp<Bitmap> SkiaOpenGLPipeline::allocateHardwareBitmap(renderthread::RenderThr
     switch (info.colorType()) {
         case kRGBA_8888_SkColorType:
             isSupported = true;
-        // ARGB_4444 is upconverted to RGBA_8888
+            // ARGB_4444 is upconverted to RGBA_8888
+            [[fallthrough]];
         case kARGB_4444_SkColorType:
             pixelFormat = PIXEL_FORMAT_RGBA_8888;
             format = GL_RGBA;