Skip to content

Commit 529a0a7

Browse files
Ram IndaniAndroid (Google) Code Review
authored andcommitted
Revert "Resync on the transaction."
This reverts commit 5b6bca4. Reason for revert: b/383209628 Change-Id: I30f766bc8b63c4ee4d421060bb7646a665957b9a
1 parent 5b6bca4 commit 529a0a7

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

services/surfaceflinger/Scheduler/Scheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ class Scheduler : public IEventThreadCallback, android::impl::MessageQueue {
205205
ftl::FakeGuard guard(kMainThreadContext);
206206
resyncToHardwareVsyncLocked(id, allowToEnable, modePtr);
207207
}
208-
void resync() override EXCLUDES(mDisplayLock);
209208
void forceNextResync() { mLastResyncTime = 0; }
210209

211210
// Passes a vsync sample to VsyncController. Returns true if
@@ -467,6 +466,7 @@ class Scheduler : public IEventThreadCallback, android::impl::MessageQueue {
467466
bool throttleVsync(TimePoint, uid_t) override;
468467
// Get frame interval
469468
Period getVsyncPeriod(uid_t) override EXCLUDES(mDisplayLock);
469+
void resync() override EXCLUDES(mDisplayLock);
470470
void onExpectedPresentTimePosted(TimePoint expectedPresentTime) override EXCLUDES(mDisplayLock);
471471

472472
std::unique_ptr<EventThread> mRenderEventThread;

services/surfaceflinger/SurfaceFlinger.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4552,7 +4552,6 @@ void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule sche
45524552
SFTRACE_INT("mTransactionFlags", transactionFlags);
45534553

45544554
if (const bool scheduled = transactionFlags & mask; !scheduled) {
4555-
mScheduler->resync();
45564555
scheduleCommit(frameHint);
45574556
} else if (frameHint == FrameHint::kActive) {
45584557
// Even if the next frame is already scheduled, we should reset the idle timer

0 commit comments

Comments
 (0)