Added check for forceClientComposition for every layer.
Instead of having the Layers check for forceClientComposition, have
SurfaceFlinger check since it will be skipping hwc. This also ensures
that new Layer types also get the same check.
Fixes: 69254085
Test: Current tests pass. Rotation works correctly now.
Change-Id: I7a2a378d9690206008b1dab9ce521f959542903a
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index aa3100e..50e2c6f 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -621,6 +621,15 @@
mHwcLayers[hwcId].forceClientComposition = true;
}
+bool Layer::getForceClientComposition(int32_t hwcId) {
+ if (mHwcLayers.count(hwcId) == 0) {
+ ALOGE("getForceClientComposition: no HWC layer found (%d)", hwcId);
+ return false;
+ }
+
+ return mHwcLayers[hwcId].forceClientComposition;
+}
+
void Layer::updateCursorPosition(const sp<const DisplayDevice>& displayDevice) {
auto hwcId = displayDevice->getHwcDisplayId();
if (mHwcLayers.count(hwcId) == 0 || getCompositionType(hwcId) != HWC2::Composition::Cursor) {