commit 1bd88fc3350640c028a0f301e6903a2a480f9397
author Dan Stoza <stoza@google.com> Fri Sep 16 19:49:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 19:49:56 2016 +0000
tree f32795741cab9cb79f4e0b84221ab2cb2886f863
parent 023394a9a3ad6ec0c8540b81d8d181e5c7e4a7e5
parent 9e718be5fbf6bd89cd734be635fc67c8e631e2f6

HWC2On1: Fall back to GLES for SolidColor am: 5df47cb648 am: d946ae67c2
am: 9e718be5fb

Change-Id: I9644bee3005e9d819fa375c41ee36b6f0e04287e

services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
index 7bca0f1..b699b2c 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp
@@ -2306,7 +2306,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;