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

Commit d6350171 authored Mar 30, 2023 by Tony Huang Committed by Automerger Merge Worker Mar 30, 2023

Merge "Do not throw exception on task vanished" into tm-qpr-dev am: e572351d...

Merge "Do not throw exception on task vanished" into tm-qpr-dev am: e572351d am: 1df1042d am: 83dde0bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22333702

Change-Id: I3b6ab36f7b5a35bc6d09b70d08840ada3eb6e9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 92a92922 83dde0bc

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -267,9 +267,6 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
		return;
		}
		sendStatusChanged();
		} else {
		throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo
		+ "\n mRootTaskInfo: " + mRootTaskInfo);
		}
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -126,12 +126,6 @@ public final class StageTaskListenerTests extends ShellTestCase {
		verify(mCallbacks).onStatusChanged(eq(mRootTask.isVisible), eq(true));
		}

		@Test(expected = IllegalArgumentException.class)
		public void testUnknownTaskVanished() {
		final ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder().build();
		mStageTaskListener.onTaskVanished(task);
		}

		@Test
		public void testTaskVanished() {
		// With shell transitions, the transition manages status changes, so skip this test.