Merge "Excluding pip Task while trying to move Activity on Top" into main (f76b4a0d) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -3390,7 +3390,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (currentFocusedApp != null && currentFocusedApp.task == task
		&& topFocusedDisplayId == mDisplayContent.getDisplayId()) {
		final Task topFocusableTask = mDisplayContent.getTask(
		(t) -> t.isLeafTask() && t.isFocusable(), true /* traverseTopToBottom */);
		(t) -> t.isLeafTask() && t.isFocusable() && !t.inPinnedWindowingMode(),
		true /* traverseTopToBottom */);
		if (task == topFocusableTask) {
		if (currentFocusedApp == this) {
		ProtoLog.d(WM_DEBUG_FOCUS, "moveFocusableActivityToTop: already on top "

+18 −0

Original line number	Diff line number	Diff line
		@@ -3727,6 +3727,24 @@ public class ActivityRecordTests extends WindowTestsBase {
		verify(task).moveTaskToBack(any());
		}

		/**
		* Verifies the {@link ActivityRecord#moveFocusableActivityToTop} returns {@code false} if
		* there's a PIP task on top.
		*/
		@Test
		public void testMoveFocusableActivityToTop() {
		// Create a Task
		final Task task = createTask(mDisplayContent);
		final ActivityRecord ar = createActivityRecord(task);

		// Create a PIP Task on top
		final Task pipTask = createTask(mDisplayContent);
		doReturn(true).when(pipTask).inPinnedWindowingMode();

		// Verifies that the Task is not moving-to-top.
		assertFalse(ar.moveFocusableActivityToTop("test"));
		}

		private ICompatCameraControlCallback getCompatCameraControlCallback() {
		return new ICompatCameraControlCallback.Stub() {
		@Override