commit d224e6111bf4532fb1c1fc021c20285b38bc80ec
author Pablo Ceballos <pceballos@google.com> Mon Jun 06 19:32:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 06 19:32:16 2016 +0000
tree d2e0f3096708ca844c4f3f35b2ba61f80f987e87
parent 09e5f59bc9a371c7b83153bb51543ec759684227
parent 7d05257585918bd578bc0bc18f32571a48a7304a

Merge "SF: Also edit currentState in doTransaction" into nyc-dev

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index dffc542..b5d3262 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1442,6 +1442,8 @@
     // this is used by Layer, which special cases resizes.
     if (flags & eDontUpdateGeometryState)  {
     } else {
+        Layer::State& editCurrentState(getCurrentState());
+        editCurrentState.active = editCurrentState.requested;
         c.active = c.requested;
     }