Merge "Ensure that expected present time is in the future" into sc-dev am:...

    // calculate the expected present time once and use the cached

    // value throughout this frame to make sure all layers are

    // seeing this same value.

    const nsecs_t lastExpectedPresentTime = mExpectedPresentTime.load();

    if (expectedVSyncTime >= frameStart) {

        mExpectedPresentTime = expectedVSyncTime;

    } else {

        const DisplayStatInfo stats = mScheduler->getDisplayStatInfo(frameStart);

        mExpectedPresentTime = calculateExpectedPresentTime(stats);

    }

    const nsecs_t lastScheduledPresentTime = mScheduledPresentTime;

    mScheduledPresentTime = expectedVSyncTime;

    // When Backpressure propagation is enabled we want to give a small grace period

    // for the present fence to fire instead of just giving up on this frame to handle cases

    const TracedOrdinal<bool> frameMissed = {"PrevFrameMissed",

                                             framePending ||

                                                     (previousPresentTime >= 0 &&

                                                      (lastExpectedPresentTime <

                                                      (lastScheduledPresentTime <

                                                       previousPresentTime - frameMissedSlop))};

    const TracedOrdinal<bool> hwcFrameMissed = {"PrevHwcFrameMissed",

                                                mHadDeviceComposition && frameMissed};

    std::unique_ptr<scheduler::RefreshRateStats> mRefreshRateStats;

    std::atomic<nsecs_t> mExpectedPresentTime = 0;

    nsecs_t mScheduledPresentTime = 0;

    hal::Vsync mHWCVsyncPendingState = hal::Vsync::DISABLE;

    std::mutex mActiveConfigLock;