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

Commit 7d54acda authored by Ioannis Ilkos's avatar Ioannis Ilkos Committed by android-build-merger
Browse files

Merge "Enable tracepoint for hot activity starts" into qt-dev 

am: 78cbd8f8

Change-Id: I40a067a28f5b8d8b00a8918fc2909c4dcbde1357
parents 7219b682 78cbd8f8

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+5 −8
Original line number Diff line number Diff line
@@ -965,17 +965,14 @@ class ActivityMetricsLogger { 
     * @param info

     * */

    private void startTraces(WindowingModeTransitionInfo info) {

        if (info == null) {

        if (!Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER) || info == null

                || info.launchTraceActive) {

            return;

        }

        int transitionType = getTransitionType(info);

        if (!info.launchTraceActive && transitionType == TYPE_TRANSITION_WARM_LAUNCH

                || transitionType == TYPE_TRANSITION_COLD_LAUNCH) {

        Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching: "

                + info.launchedActivity.packageName, 0);

        info.launchTraceActive = true;

    }

    }



    private void stopLaunchTrace(WindowingModeTransitionInfo info) {

        if (info == null) {