Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d0ade1 authored by Long Ling's avatar Long Ling
Browse files

resolve merge conflicts of eae0ae9c to master 

Bug: 140823887
Test: Manual test with Calculator app
Change-Id: I18e225dd74bbdb227d891f33b823d38112b05c17
parents 0a7c50d3 eae0ae9c

services/surfaceflinger/Scheduler/Scheduler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ void Scheduler::resyncToHardwareVsync(bool makeAvailable, nsecs_t period) { 
}



void Scheduler::resync() {

    static constexpr nsecs_t kIgnoreDelay = ms2ns(500);

    static constexpr nsecs_t kIgnoreDelay = ms2ns(750);



    const nsecs_t now = systemTime();

    const nsecs_t last = mLastResyncTime.exchange(now);