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

Commit 6476b9b1 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Automerger Merge Worker
Browse files

Merge "Ensure reportFrameMetrics not being called on deleted instance" into... 

Merge "Ensure reportFrameMetrics not being called on deleted instance" into sc-dev am: eb24079b am: 3569c781

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

Change-Id: Ia928c172bb5e40e58121df5ee627230fcab92480
parents 5b1d9c7a 3569c781

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ void CanvasContext::onSurfaceStatsAvailable(void* context, ASurfaceControl* cont 
        frameInfo->set(FrameInfoIndex::FrameCompleted) = std::max(gpuCompleteTime,

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

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

        std::lock_guard(instance->mFrameMetricsReporterMutex);

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

    }

}

libs/hwui/renderthread/CanvasContext.h

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ public: 
        if (mFrameMetricsReporter.get() != nullptr) {

            mFrameMetricsReporter->removeObserver(observer);

            if (!mFrameMetricsReporter->hasObservers()) {

                std::lock_guard lock(mFrameMetricsReporterMutex);

                mFrameMetricsReporter.reset(nullptr);

            }

        }
@@ -295,6 +296,7 @@ private: 
    JankTracker mJankTracker;

    FrameInfoVisualizer mProfiler;

    std::unique_ptr<FrameMetricsReporter> mFrameMetricsReporter;

    std::mutex mFrameMetricsReporterMutex;



    std::set<RenderNode*> mPrefetchedLayers;