commit 22ca2c4a9e74736d2dccf9145c975a63e2c04a83
author Yiwei Zhang <zzyiwei@google.com> Thu Jul 07 07:00:16 2022 +0000
committer Yiwei Zhang <zzyiwei@google.com> Thu Jul 07 08:08:54 2022 +0000
tree bdec36193dccfb3ba36c78851d34ee4045815fe5
parent 285cd414992bfbdc0087bd421aefce67d5ebcbda

Fix bufferNeedsFiltering to compare in the same coordination

Bug: 238246763
Test: SurfaceViewTests#testMovingWhiteSurfaceView
Change-Id: Idf826fe99791674ff1e2f6cf70c6f44f35190dc6

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 3875f15..d88d7c9 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -853,7 +853,15 @@
     }
 
     const Rect layerSize{getBounds()};
-    return layerSize.width() != bufferWidth || layerSize.height() != bufferHeight;
+    int32_t layerWidth = layerSize.getWidth();
+    int32_t layerHeight = layerSize.getHeight();
+
+    // Align the layer orientation with the buffer before comparism
+    if (mTransformHint & ui::Transform::ROT_90) {
+        std::swap(layerWidth, layerHeight);
+    }
+
+    return layerWidth != bufferWidth || layerHeight != bufferHeight;
 }
 
 void BufferStateLayer::decrementPendingBufferCount() {