Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19370ab6 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix fallthrough warning" am: e1813e52 

am: 937e4af0

Change-Id: I4d2bbdca778d22a184d62164a4e2917ccdc2f8e7
parents ba5fa4dd 937e4af0

libs/hwui/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -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,

    },

libs/hwui/HardwareBitmapUploader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;