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

Commit 59e29276 authored by Ahan Wu's avatar Ahan Wu
Browse files

Make sure the removeObservers be called correctly 

Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Bug: 197555842
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Test: see 198714745#comment6
Change-Id: Ic6d2521d788c50e10b81b556849194a97f240376
Merged-In: Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c
parent f80f8fed

core/java/com/android/internal/jank/FrameTracker.java

+14 −5
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.internal.util.FrameworkStatsLog; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.concurrent.TimeUnit;



/**

 * A class that allows the app to get the frame metrics from HardwareRendererObserver.
@@ -103,6 +104,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
    private boolean mCancelled = false;

    private FrameTrackerListener mListener;

    private boolean mTracingStarted = false;

    private Runnable mWaitForFinishTimedOut;



    private static class JankInfo {

        long frameVsyncId;
@@ -263,10 +265,16 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
            if (mListener != null) {

                mListener.onCujEvents(mSession, ACTION_SESSION_END);

            }

        }

            // We don't remove observer here,

            // will remove it when all the frame metrics in this duration are called back.

            // See onFrameMetricsAvailable for the logic of removing the observer.

            // Waiting at most 10 seconds for all callbacks to finish.

            mWaitForFinishTimedOut = () -> {

                Log.e(TAG, "force finish cuj because of time out:" + mSession.getName());

                finish(mJankInfos.size() - 1);

            };

            mHandler.postDelayed(mWaitForFinishTimedOut, TimeUnit.SECONDS.toMillis(10));

        }

    }



    /**
@@ -396,7 +404,8 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
    }



    private void finish(int indexOnOrAfterEnd) {



        mHandler.removeCallbacks(mWaitForFinishTimedOut);

        mWaitForFinishTimedOut = null;

        mMetricsFinalized = true;



        // The tracing has been ended, remove the observer, see if need to trigger perfetto.
@@ -481,7 +490,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
            }

        }

        if (DEBUG) {

            Log.i(TAG, "FrameTracker: CUJ=" + mSession.getName()

            Log.i(TAG, "finish: CUJ=" + mSession.getName()

                    + " (" + mBeginVsyncId + "," + mEndVsyncId + ")"

                    + " totalFrames=" + totalFramesCount

                    + " missedAppFrames=" + missedAppFramesCount

core/java/com/android/internal/jank/InteractionJankMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class InteractionJankMonitor { 
    private static final String ACTION_PREFIX = InteractionJankMonitor.class.getCanonicalName();



    private static final String DEFAULT_WORKER_NAME = TAG + "-Worker";

    private static final long DEFAULT_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(5L);

    private static final long DEFAULT_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(2L);

    private static final String SETTINGS_ENABLED_KEY = "enabled";

    private static final String SETTINGS_SAMPLING_INTERVAL_KEY = "sampling_interval";

    private static final String SETTINGS_THRESHOLD_MISSED_FRAMES_KEY =