commit 9e718be5fbf6bd89cd734be635fc67c8e631e2f6
author Dan Stoza <stoza@google.com> Fri Sep 16 19:47:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 16 19:47:02 2016 +0000
tree 956d4eca28e526ad22010188eb0abd2ebc8acb35
parent fde6e0c2b9f01ec1032bf5d24600d0a755b0cbd0
parent d946ae67c28fd70b135e47decd285695da512135

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

Change-Id: I9c866a4cbf23f4e8dcdaf922063c4a26f7da7c51

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;