commit 7d05257585918bd578bc0bc18f32571a48a7304a
author Pablo Ceballos <pceballos@google.com> Thu Jun 02 17:46:05 2016 -0700
committer Pablo Ceballos <pceballos@google.com> Fri Jun 03 19:35:16 2016 -0700
tree 7b0a14b127cefa60633cc692f38ff9af8341eda4
parent e4ecdb66d5c2eed64cbd5b267e0621cab7b8a63b

SF: Also edit currentState in doTransaction

Bug 28899837

Change-Id: I46c8301549c627c5d1c7efa661055aba787a33d6

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;
     }