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
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 1d73b43..c623672 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -431,7 +431,7 @@
virtual void onFrameReplaced(const BufferItem& item) override;
virtual void onSidebandStreamChanged() override;
- void commitTransaction();
+ void commitTransaction(const State& stateToCommit);
// needsLinearFiltering - true if this surface's state requires filtering
bool needsFiltering(const sp<const DisplayDevice>& hw) const;
@@ -500,8 +500,8 @@
bool addSyncPoint(const std::shared_ptr<SyncPoint>& point);
void pushPendingState();
- void popPendingState();
- bool applyPendingStates();
+ void popPendingState(State* stateToCommit);
+ bool applyPendingStates(State* stateToCommit);
public:
void notifyAvailableFrames();
private: