commit c1498e6ed132092312e160ab00b0a2c8633611ed
author David Sodman <dsodman@google.com> Wed Sep 12 14:36:26 2018 -0700
committer David Sodman <dsodman@google.com> Thu Sep 13 17:21:37 2018 -0700
tree 1f1db8a8ae4349c7243333ccb6acb5dc55adb185
parent 78bc0453718d2755bc64e34b9157095d01a156ad

SF: Use getVisibleLayers... in doComposeSurfaces

in b/114101122, it is discovered that there is a problem
in indexing the SF mCompositionInfo by displayId because
there are multiple displays that have the same id (-1).

This change uses getVisibleLayersSortedByZ in doComposeSurfaces
until we can fix the indexing of mCompositionInfo.

Bug: 114101122
Test: run cts -m CtsViewTestCases, CtsMediaTestCases

Change-Id: I90adb957c183400c396f25fa9583b668e1da8417

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index d963ab6..6b56ca4 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -500,6 +500,8 @@
             validateChange(compositionInfo.compositionType,
                     changedTypes[&*hwcLayer]);
             compositionInfo.compositionType = changedTypes[&*hwcLayer];
+            compositionInfo.layer->mLayer->setCompositionType(displayId,
+                    compositionInfo.compositionType, false);
         }
 
         switch (compositionInfo.compositionType) {
@@ -520,6 +522,7 @@
                 layerRequests[&*hwcLayer] ==
                         HWC2::LayerRequest::ClearClientTarget) {
             compositionInfo.hwc.clearClientTarget = true;
+            compositionInfo.layer->mLayer->setClearClientTarget(displayId, true);
         } else {
             if (layerRequests.count(&*hwcLayer) != 0) {
                 LOG_DISPLAY_ERROR(displayId,
@@ -527,6 +530,7 @@
                                           .c_str());
             }
             compositionInfo.hwc.clearClientTarget = false;
+            compositionInfo.layer->mLayer->setClearClientTarget(displayId, false);
         }
     }