Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix fallthrough warning"

Browse Source
This commit is contained in:
Colin Cross
2019-10-31 22:20:40 +00:00
committed by Gerrit Code Review
parent 583a1beac1 f4e74b8fa0
commit e1813e522f
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/Android.bp
View File

@@ -234,9 +234,6 @@ cc_defaults {
"protos/graphicsstats.proto", "protos/graphicsstats.proto",
], ],
// Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.
cflags: ["-Wno-implicit-fallthrough"],
proto: { proto: {
export_proto_headers: true, export_proto_headers: true,
}, },

1
libs/hwui/HardwareBitmapUploader.cpp
View File

@@ -302,6 +302,7 @@ static FormatInfo determineFormat(const SkBitmap& skBitmap, bool usingGL) {
switch (skBitmap.info().colorType()) { switch (skBitmap.info().colorType()) {
case kRGBA_8888_SkColorType: case kRGBA_8888_SkColorType:
formatInfo.isSupported = true; formatInfo.isSupported = true;
[[fallthrough]];
// ARGB_4444 is upconverted to RGBA_8888 // ARGB_4444 is upconverted to RGBA_8888
case kARGB_4444_SkColorType: case kARGB_4444_SkColorType:
formatInfo.pixelFormat = PIXEL_FORMAT_RGBA_8888; formatInfo.pixelFormat = PIXEL_FORMAT_RGBA_8888;