summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rachel Lee <rnlee@google.com> 2023-03-14 17:53:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-14 17:53:54 +0000
commitd6271e0eb080025ee5f0cc3fa82b2c0c73e9675a (patch)
tree22aa14cb79ad466992c8e9ea499e4e80595e2147
parenta5be328a8f3cb420ecdae34e9b25060631616a8f (diff)
Revert "Resync on the transaction."
This reverts commit a5be328a8f3cb420ecdae34e9b25060631616a8f. Reason for revert: b/272956327 Change-Id: I0484a0396144cbcaa76e9b3a38d157f744d9a303
-rw-r--r--services/surfaceflinger/Scheduler/Scheduler.cpp1
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp
index 6e332721b8..f18dfdceb6 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.cpp
+++ b/services/surfaceflinger/Scheduler/Scheduler.cpp
@@ -402,7 +402,6 @@ void Scheduler::disableHardwareVsync(PhysicalDisplayId id, bool disallow) {
}
void Scheduler::resyncAllToHardwareVsync(bool allowToEnable) {
- ATRACE_CALL();
std::scoped_lock lock(mDisplayLock);
ftl::FakeGuard guard(kMainThreadContext);
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e708a659a3..2c1e3339d8 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4119,7 +4119,6 @@ void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule sche
ATRACE_INT("mTransactionFlags", transactionFlags);
if (const bool scheduled = transactionFlags & mask; !scheduled) {
- mScheduler->resync();
scheduleCommit(frameHint);
} else if (frameHint == FrameHint::kActive) {
// Even if the next frame is already scheduled, we should reset the idle timer