Avoid clearing transaction flags too early
Transaction flags were cleared in commitTransactions before
checking if we needed to run the composite stage. This caused
us to miss some updates. In addition, display color matrix is only
updated if the colorMatrixChanged is set so, if we miss an update
device would be in an invalid state until the next update.
Fixes: 300194609
Test: presubmit
Change-Id: Ie397d4c37af6b54ff8d59e1151ddee24811e2d13
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index b54392e..3b39420 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -611,6 +611,15 @@
void releaseLegacyLayer(uint32_t sequence) { mFlinger->mLegacyLayers.erase(sequence); };
auto updateLayerHistory(nsecs_t now) { return mFlinger->updateLayerHistory(now); };
+ auto setDaltonizerType(ColorBlindnessType type) {
+ mFlinger->mDaltonizer.setType(type);
+ return mFlinger->updateColorMatrixLocked();
+ }
+ auto updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs, bool transactionsFlushed,
+ bool& out) {
+ ftl::FakeGuard guard(kMainThreadContext);
+ return mFlinger->updateLayerSnapshots(vsyncId, frameTimeNs, transactionsFlushed, out);
+ }
/* ------------------------------------------------------------------------
* Read-write access to private data to set up preconditions and assert
* post-conditions.