From 7d05257585918bd578bc0bc18f32571a48a7304a Mon Sep 17 00:00:00 2001
From: Pablo Ceballos <pceballos@google.com>
Date: Thu, 2 Jun 2016 17:46:05 -0700
Subject: SF: Also edit currentState in doTransaction

Bug 28899837

Change-Id: I46c8301549c627c5d1c7efa661055aba787a33d6
---
 services/surfaceflinger/Layer.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'services/surfaceflinger/Layer.cpp')

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index dffc5425c5..b5d3262056 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1442,6 +1442,8 @@ uint32_t Layer::doTransaction(uint32_t flags) {
     // 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;
     }
 
-- 
cgit v1.2.3-59-g8ed1b