summaryrefslogtreecommitdiff
path: root/libs/hwui/HardwareBitmapUploader.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-10-31 15:56:30 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-31 15:56:30 -0700
commit19370ab6b1afdb55ccf9589ca8e2f1fd64439285 (patch)
tree719de7dec32d7fa362ae13f7d7e559c4e6a13b4d /libs/hwui/HardwareBitmapUploader.cpp
parentba5fa4dd52e466a2b94852db994ed32f00bb03d9 (diff)
parent937e4af019431578cba344f79e1b8b15d1eeb6b1 (diff)
Merge "Fix fallthrough warning" am: e1813e522f
am: 937e4af019 Change-Id: I4d2bbdca778d22a184d62164a4e2917ccdc2f8e7
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
-rw-r--r--libs/hwui/HardwareBitmapUploader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 9bb6031b76ac..b64588e0dcd2 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;