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

Commit d83b8df7 authored by Yu Shan's avatar Yu Shan Committed by Automerger Merge Worker
Browse files

Use a different timesource in recurrent timer. am: 8e532e6d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19607640



Change-Id: I460f4dbd4fd74de43f0d33a55ab0f5240bd126b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c86d315 8e532e6d

automotive/vehicle/aidl/impl/utils/common/src/RecurrentTimer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void RecurrentTimer::registerTimerCallback(int64_t intervalInNano, 
        std::scoped_lock<std::mutex> lockGuard(mLock);



        // Aligns the nextTime to multiply of interval.

        int64_t nextTime = ceil(elapsedRealtimeNano() / intervalInNano) * intervalInNano;

        int64_t nextTime = ceil(uptimeNanos() / intervalInNano) * intervalInNano;



        std::unique_ptr<CallbackInfo> info = std::make_unique<CallbackInfo>();

        info->callback = callback;
@@ -128,7 +128,7 @@ void RecurrentTimer::loop() { 
            }

            // The first element is the nearest next event.

            int64_t nextTime = mCallbackQueue[0]->nextTime;

            int64_t now = elapsedRealtimeNano();

            int64_t now = uptimeNanos();

            if (nextTime > now) {

                interval = nextTime - now;

            } else {
@@ -146,7 +146,7 @@ void RecurrentTimer::loop() { 


        {

            ScopedLockAssertion lockAssertion(mLock);

            int64_t now = elapsedRealtimeNano();

            int64_t now = uptimeNanos();

            while (mCallbackQueue.size() > 0) {

                int64_t nextTime = mCallbackQueue[0]->nextTime;

                if (nextTime > now) {