commit a3ed032256c475ce13c52b0261da6a5e2ffa77be
author Rob Carr <racarr@google.com> Tue May 16 19:40:52 2017 +0000
committer Rob Carr <racarr@google.com> Tue May 16 19:40:52 2017 +0000
tree 8e08d072fd30f555c4b021b94ca0057ae4594407
parent 1e079c2804edfae77925150280fe79418e58750b

Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."

This reverts commit 1e079c2804edfae77925150280fe79418e58750b.

Bug: 38331032
Change-Id: Ib703b7b80a940550487a80d8ad62947e4becae93

services/surfaceflinger/LayerRejecter.cpp

diff --git a/services/surfaceflinger/LayerRejecter.cpp b/services/surfaceflinger/LayerRejecter.cpp
index b2424d0..0b302eb 100644
--- a/services/surfaceflinger/LayerRejecter.cpp
+++ b/services/surfaceflinger/LayerRejecter.cpp
@@ -37,7 +37,7 @@
     mStickyTransformSet(stickySet),
     mName(name),
     mOverrideScalingMode(overrideScalingMode),
-    mFreezeGeometryUpdates(freezePositionUpdates) {}
+    mFreezePositionUpdates(freezePositionUpdates) {}
 
 bool LayerRejecter::reject(const sp<GraphicBuffer>& buf, const BufferItem& item) {
     if (buf == NULL) {
@@ -115,7 +115,17 @@
         mRecomputeVisibleRegions = true;
     }
 
-    mFreezeGeometryUpdates = false;
+    if (mFront.crop != mFront.requestedCrop) {
+        mFront.crop = mFront.requestedCrop;
+        mCurrent.crop = mFront.requestedCrop;
+        mRecomputeVisibleRegions = true;
+    }
+    if (mFront.finalCrop != mFront.requestedFinalCrop) {
+        mFront.finalCrop = mFront.requestedFinalCrop;
+        mCurrent.finalCrop = mFront.requestedFinalCrop;
+        mRecomputeVisibleRegions = true;
+    }
+    mFreezePositionUpdates = false;
 
     return false;
 }