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

Commit de3db139 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SF: Trace hal::HWDisplayId on hardware VSYNC" into udc-dev am: 7702161e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21546155



Change-Id: I14d3916abae1bf84a6c3260ccc2a7ba5295c40db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 658c6928 7702161e

services/surfaceflinger/SurfaceFlinger.cpp

+3 −9
Original line number Diff line number Diff line
@@ -2031,15 +2031,9 @@ nsecs_t SurfaceFlinger::getVsyncPeriodFromHWC() const { 


void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t timestamp,

                                        std::optional<hal::VsyncPeriodNanos> vsyncPeriod) {

    const std::string tracePeriod = [vsyncPeriod]() {

        if (ATRACE_ENABLED() && vsyncPeriod) {

            std::stringstream ss;

            ss << "(" << *vsyncPeriod << ")";

            return ss.str();

        }

        return std::string();

    }();

    ATRACE_FORMAT("onComposerHalVsync%s", tracePeriod.c_str());

    ATRACE_NAME(vsyncPeriod

                        ? ftl::Concat(__func__, ' ', hwcDisplayId, ' ', *vsyncPeriod, "ns").c_str()

                        : ftl::Concat(__func__, ' ', hwcDisplayId).c_str());



    Mutex::Autolock lock(mStateLock);