OSDN Git Service

SF: Don't pop pending state into mCurrentState
authorPablo Ceballos <pceballos@google.com>
Thu, 14 Apr 2016 22:49:55 +0000 (15:49 -0700)
committerPablo Ceballos <pceballos@google.com>
Thu, 14 Apr 2016 23:01:23 +0000 (16:01 -0700)
commit05289c2b78d21308a95ea6ef8f1d8f24359147cd
tree4f17199a81080babed45f380464b21e205fb0c57
parent9ffa1a4da16edc23067070f5605917ddd57739e8
SF: Don't pop pending state into mCurrentState

Let mCurrentState always represent the most up to date state, even if
there are transactions we don't want to commit yet. Past snapshots of
the state are kept in mPendingState. In doTransaction(), grab the
correct pending state from mPendingState, but save it to a local copy
that gets committed rather than overriding mCurrentState.

Bug 27205755

Change-Id: Ib0ea809da1954409787c52b8f41d7963a57a6a4c
services/surfaceflinger/Layer.cpp
services/surfaceflinger/Layer.h
services/surfaceflinger/tests/Transaction_test.cpp