From f4e74b8fa017083ec2445b3ee99cff561d44c94f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 31 Oct 2019 13:47:42 -0700
Subject: [PATCH] Fix fallthrough warning

Fix a single fallthrough warning and re-enable -Wimplicit-fallthrough.

Test: m libhwui
Change-Id: I850f53f717417f70c9d0416176d03fd64473d1ba
---
 libs/hwui/Android.bp                 | 3 ---
 libs/hwui/HardwareBitmapUploader.cpp | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index f51848e5691a1..4c08a38299346 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -234,9 +234,6 @@ cc_defaults {
         "protos/graphicsstats.proto",
     ],
 
-    // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.
-    cflags: ["-Wno-implicit-fallthrough"],
-
     proto: {
         export_proto_headers: true,
     },
diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 9bb6031b76ac1..b64588e0dcd2d 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -302,6 +302,7 @@ static FormatInfo determineFormat(const SkBitmap& skBitmap, bool usingGL) {
     switch (skBitmap.info().colorType()) {
         case kRGBA_8888_SkColorType:
             formatInfo.isSupported = true;
+            [[fallthrough]];
         // ARGB_4444 is upconverted to RGBA_8888
         case kARGB_4444_SkColorType:
             formatInfo.pixelFormat = PIXEL_FORMAT_RGBA_8888;