From a4fd568a7959e730a2542e695ea6c0a48d78c85c Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Tue, 30 Oct 2018 14:32:19 -0700
Subject: [PATCH] Fix implicit-fallthrough warnings. DO NOT MERGE.

These changes are not needed in goog/master.

Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
(cherry picked from commit df891f8a31daafe488c00bb95a5afff14af83e43)
Exempt-From-Owner-Approval: do not block on new warnings
---
 libs/hwui/Caches.cpp                           | 4 ++--
 libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 3c774a3313d21..0ffd116236f56 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 270527d551a9e..cb503593c6c8c 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;