diff options
| author | Pablo Ceballos <pceballos@google.com> | 2016-06-06 19:32:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-06 19:32:16 +0000 |
| commit | d224e6111bf4532fb1c1fc021c20285b38bc80ec (patch) | |
| tree | d2e0f3096708ca844c4f3f35b2ba61f80f987e87 | |
| parent | 09e5f59bc9a371c7b83153bb51543ec759684227 (diff) | |
| parent | 7d05257585918bd578bc0bc18f32571a48a7304a (diff) | |
| download | native-d224e6111bf4532fb1c1fc021c20285b38bc80ec.tar.gz | |
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |