Merge "Add exit logs to various points" into main (a53ee4f6) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitscreenEventLogger.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED_
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__CHILD_TASK_ENTER_PIP;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DEVICE_FOLDED;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DRAG_DIVIDER;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_REQUEST;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_SHORTCUT;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__DESKTOP_MODE;
		import static com.android.internal.util.FrameworkStatsLog.SPLITSCREEN_UICHANGED__EXIT_REASON__RECREATE_SPLIT;
		@@ -45,6 +46,7 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DEVICE_FOLDED;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DRAG_DIVIDER;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_DESKTOP_MODE;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_FULLSCREEN_REQUEST;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_FULLSCREEN_SHORTCUT;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RECREATE_SPLIT;
		import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_RETURN_HOME;
		@@ -211,6 +213,8 @@ public class SplitscreenEventLogger {
		return SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_SHORTCUT;
		case EXIT_REASON_DESKTOP_MODE:
		return SPLITSCREEN_UICHANGED__EXIT_REASON__DESKTOP_MODE;
		case EXIT_REASON_FULLSCREEN_REQUEST:
		return SPLITSCREEN_UICHANGED__EXIT_REASON__FULLSCREEN_REQUEST;
		case EXIT_REASON_UNKNOWN:
		// Fall through
		default:

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -1175,6 +1175,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mSplitTransitions.startDismissTransition(wct, this, mLastActiveStage, reason);
		setSplitsVisible(false);
		mBreakOnNextWake = false;
		logExit(reason);
		}

		void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) {
		@@ -1265,6 +1266,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		prepareExitSplitScreen(stage, wct);
		mSplitTransitions.startDismissTransition(wct, this, stage, exitReason);
		logExit(exitReason);
		}

		/**
		@@ -1361,6 +1363,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mMainStage.doForAllChildTasks(taskId -> recentTasks.removeSplitPair(taskId));
		mSideStage.doForAllChildTasks(taskId -> recentTasks.removeSplitPair(taskId));
		});
		logExit(exitReason);
		}

		/**
		@@ -1579,7 +1582,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		if (stage == STAGE_TYPE_MAIN) {
		mLogger.logMainStageAppChange(getMainStagePosition(), mMainStage.getTopChildTaskUid(),
		mSplitLayout.isLeftRightSplit());
		} else {
		} else if (stage == STAGE_TYPE_SIDE) {
		mLogger.logSideStageAppChange(getSideStagePosition(), mSideStage.getTopChildTaskUid(),
		mSplitLayout.isLeftRightSplit());
		}
		@@ -2275,6 +2278,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		if (isOpening && inFullscreen) {
		// One task is opening into fullscreen mode, remove the corresponding split record.
		mRecentTasks.ifPresent(recentTasks -> recentTasks.removeSplitPair(triggerTask.taskId));
		logExit(EXIT_REASON_FULLSCREEN_REQUEST);
		}

		if (isSplitActive()) {
		@@ -2402,6 +2406,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		if (triggerTask != null) {
		mRecentTasks.ifPresent(
		recentTasks -> recentTasks.removeSplitPair(triggerTask.taskId));
		logExit(EXIT_REASON_CHILD_TASK_ENTER_PIP);
		}
		@StageType int topStage = STAGE_TYPE_UNDEFINED;
		if (isSplitScreenVisible()) {
		@@ -2743,7 +2748,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		final int dismissTop = mainChild != null ? STAGE_TYPE_MAIN :
		(sideChild != null ? STAGE_TYPE_SIDE : STAGE_TYPE_UNDEFINED);
		pendingEnter.cancel(
		(cancelWct, cancelT) -> prepareExitSplitScreen(dismissTop, cancelWct));
		(cancelWct, cancelT) -> {
		prepareExitSplitScreen(dismissTop, cancelWct);
		logExit(EXIT_REASON_UNKNOWN);
		});
		Log.w(TAG, splitFailureMessage("startPendingEnterAnimation",
		"launched 2 tasks in split, but didn't receive "
		+ "2 tasks in transition. Possibly one of them failed to launch"));