Merge "Add CUJ constants for SUW jank insturmentation" into tm-dev (b6acbe6c) · Commits · e / os / android_frameworks_base

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

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,10 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_AVD;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_AVD;
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_EXIT_ANIM;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SPLASHSCREEN_EXIT_ANIM;
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__STATUS_BAR_APP_LAUNCH_FROM_CALL_CHIP;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__STATUS_BAR_APP_LAUNCH_FROM_CALL_CHIP;
			import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_SCREEN_FOR_STATUS;
			import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_TO_NEXT_FLOW;
			import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS;
			import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS;
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM;
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_SWITCH;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__USER_SWITCH;
	import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WALLPAPER_TRANSITION;		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__WALLPAPER_TRANSITION;
	@@ -176,6 +180,10 @@ public class InteractionJankMonitor {
	public static final int CUJ_ONE_HANDED_ENTER_TRANSITION = 42;		public static final int CUJ_ONE_HANDED_ENTER_TRANSITION = 42;
	public static final int CUJ_ONE_HANDED_EXIT_TRANSITION = 43;		public static final int CUJ_ONE_HANDED_EXIT_TRANSITION = 43;
	public static final int CUJ_UNFOLD_ANIM = 44;		public static final int CUJ_UNFOLD_ANIM = 44;
			public static final int CUJ_SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS = 45;
			public static final int CUJ_SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS = 46;
			public static final int CUJ_SUW_LOADING_TO_NEXT_FLOW = 47;
			public static final int CUJ_SUW_LOADING_SCREEN_FOR_STATUS = 48;

	private static final int NO_STATSD_LOGGING = -1;		private static final int NO_STATSD_LOGGING = -1;

	@@ -229,6 +237,10 @@ public class InteractionJankMonitor {
	UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__ONE_HANDED_ENTER_TRANSITION,		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__ONE_HANDED_ENTER_TRANSITION,
	UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__ONE_HANDED_EXIT_TRANSITION,		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__ONE_HANDED_EXIT_TRANSITION,
	UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM,		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__UNFOLD_ANIM,
			UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS,
			UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS,
			UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_TO_NEXT_FLOW,
			UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SUW_LOADING_SCREEN_FOR_STATUS,
	};		};

	private static volatile InteractionJankMonitor sInstance;		private static volatile InteractionJankMonitor sInstance;
	@@ -294,6 +306,10 @@ public class InteractionJankMonitor {
	CUJ_ONE_HANDED_ENTER_TRANSITION,		CUJ_ONE_HANDED_ENTER_TRANSITION,
	CUJ_ONE_HANDED_EXIT_TRANSITION,		CUJ_ONE_HANDED_EXIT_TRANSITION,
	CUJ_UNFOLD_ANIM,		CUJ_UNFOLD_ANIM,
			CUJ_SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS,
			CUJ_SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS,
			CUJ_SUW_LOADING_TO_NEXT_FLOW,
			CUJ_SUW_LOADING_SCREEN_FOR_STATUS
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface CujType {		public @interface CujType {
	@@ -701,6 +717,14 @@ public class InteractionJankMonitor {
	return "ONE_HANDED_EXIT_TRANSITION";		return "ONE_HANDED_EXIT_TRANSITION";
	case CUJ_UNFOLD_ANIM:		case CUJ_UNFOLD_ANIM:
	return "UNFOLD_ANIM";		return "UNFOLD_ANIM";
			case CUJ_SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS:
			return "SUW_LOADING_TO_SHOW_INFO_WITH_ACTIONS";
			case CUJ_SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS:
			return "SUW_SHOW_FUNCTION_SCREEN_WITH_ACTIONS";
			case CUJ_SUW_LOADING_TO_NEXT_FLOW:
			return "SUW_LOADING_TO_NEXT_FLOW";
			case CUJ_SUW_LOADING_SCREEN_FOR_STATUS:
			return "SUW_LOADING_SCREEN_FOR_STATUS";
	}		}
	return "UNKNOWN";		return "UNKNOWN";
	}		}