commit d946ae67c28fd70b135e47decd285695da512135
author Dan Stoza <stoza@google.com> Fri Sep 16 19:45:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 19:45:01 2016 +0000
tree 8b0f73244ded2df8c41fae34ae17e2f8fd319c22
parent 59d8480530dbc67814a2db748e0f7df731b8e3be
parent 5df47cb648a6911dd62527901bb209fd65c73bed

HWC2On1: Fall back to GLES for SolidColor
am: 5df47cb648

Change-Id: I485ae0aa189b5338f6f98dd3c716dd87dac60ab1

services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
index 8bcee39..cc0dfb0 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
@@ -2305,7 +2305,14 @@
                 hwc1Layer.compositionType = HWC_FRAMEBUFFER;
                 break;
             case Composition::SolidColor:
-                hwc1Layer.compositionType = HWC_BACKGROUND;
+                // In theory the following line should work, but since the HWC1
+                // version of SurfaceFlinger never used HWC_BACKGROUND, HWC1
+                // devices may not work correctly. To be on the safe side, we
+                // fall back to client composition.
+                //
+                // hwc1Layer.compositionType = HWC_BACKGROUND;
+                hwc1Layer.compositionType = HWC_FRAMEBUFFER;
+                hwc1Layer.flags |= HWC_SKIP_LAYER;
                 break;
             case Composition::Cursor:
                 hwc1Layer.compositionType = HWC_FRAMEBUFFER;