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

Commit 83dde0bc 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 am: 1df1042d

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

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

parents eb8925bd 1df1042d

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.