commit f4e74b8fa017083ec2445b3ee99cff561d44c94f
author Colin Cross <ccross@android.com> Thu Oct 31 13:47:42 2019 -0700
committer Colin Cross <ccross@android.com> Thu Oct 31 13:47:42 2019 -0700
tree a1cbb6d6397c72067d9b0a3a0669d53486003288
parent 1b908876297ba6c630020426baa6bc483ffcc64f

Fix fallthrough warning

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

Test: m libhwui
Change-Id: I850f53f717417f70c9d0416176d03fd64473d1ba

libs/hwui/Android.bp

diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index f51848e5..4c08a38 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -234,9 +234,6 @@
         "protos/graphicsstats.proto",
     ],
 
-    // Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.
-    cflags: ["-Wno-implicit-fallthrough"],
-
     proto: {
         export_proto_headers: true,
     },

libs/hwui/HardwareBitmapUploader.cpp

diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 9bb6031..b64588e 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -302,6 +302,7 @@
     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;