Merge "Use SwapBuffersCompleted as frame end time" into sc-dev

    }

    if (frameInfo != nullptr) {

        if (gpuCompleteTime == -1) {

            gpuCompleteTime = frameInfo->get(FrameInfoIndex::SwapBuffersCompleted);

        }

        if (gpuCompleteTime < frameInfo->get(FrameInfoIndex::IssueDrawCommandsStart)) {

            // On Vulkan the GPU commands are flushed to the GPU during IssueDrawCommands rather

            // than after SwapBuffers. So if the GPU signals before issue draw commands, then

            // something probably went wrong. Anything after that could just be expected

            // pipeline differences

            ALOGW("Impossible GPU complete time issueCommandsStart=%" PRIi64

                  " gpuComplete=%" PRIi64,

                  frameInfo->get(FrameInfoIndex::IssueDrawCommandsStart), gpuCompleteTime);

            gpuCompleteTime = frameInfo->get(FrameInfoIndex::SwapBuffersCompleted);

        }

        frameInfo->set(FrameInfoIndex::FrameCompleted) = gpuCompleteTime;

        frameInfo->set(FrameInfoIndex::FrameCompleted) = std::max(gpuCompleteTime,

                frameInfo->get(FrameInfoIndex::SwapBuffersCompleted));

        frameInfo->set(FrameInfoIndex::GpuCompleted) = gpuCompleteTime;

        instance->mJankTracker.finishFrame(*frameInfo, instance->mFrameMetricsReporter);

    }