commit 572e23d7614485a06102b00667d003b21b874bf9
author David Sehr <sehr@google.com> Mon Jun 06 20:16:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 06 20:16:11 2016 +0000
tree 76460152446113bc4c53bed265f52f3b88b85b98
parent d224e6111bf4532fb1c1fc021c20285b38bc80ec
parent 40e566de4b17a0f5f200fbf5014d30367c1992fa

Merge "Enable profman pretty printing" 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;
     }