Merge "Fix fallthrough warning" am: e1813e522f

am: 937e4af019 Change-Id: I4d2bbdca778d22a184d62164a4e2917ccdc2f8e7
2019-10-31 15:56:30 -07:00
parent ba5fa4dd52 937e4af019
commit 19370ab6b1
2 changed files with 1 additions and 3 deletions
--- 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,
    },
--- 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;