commit 904d4df89a20d982ec27c6a8c6cf784a3fb235af
author Bill Yi <byi@google.com> Wed Oct 24 17:17:46 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 17:17:46 2018 -0700
tree b4fa61d5eb0189276360ec3af912d7c3ea5194fb
parent 2c8ace079414321a47f4c2cf29e044a64a66a266
parent 8b634e919137f69589347b2ac5ae49183f1a7549

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 8b634e9191  -s ours

Change-Id: I2c4b9184789a1bdae2cec06e0e72f6c6ca049113

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 0ffd116..3c774a3 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -234,13 +234,13 @@
             gradientCache.clear();
             fontRenderer.clear();
             fboCache.clear();
-            [[fallthrough]];
+        // fall through
         case FlushMode::Moderate:
             fontRenderer.flush();
             textureCache.flush();
             pathCache.clear();
             tessellationCache.clear();
-            [[fallthrough]];
+        // fall through
         case FlushMode::Layers:
             renderBufferCache.clear();
             break;

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index cb50359..270527d5 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -331,8 +331,7 @@
     switch (info.colorType()) {
         case kRGBA_8888_SkColorType:
             isSupported = true;
-            // ARGB_4444 is upconverted to RGBA_8888
-            [[fallthrough]];
+        // ARGB_4444 is upconverted to RGBA_8888
         case kARGB_4444_SkColorType:
             pixelFormat = PIXEL_FORMAT_RGBA_8888;
             format = GL_RGBA;