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

Commit e572351d authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Do not throw exception on task vanished" into tm-qpr-dev

parents 9ed16e1b 76ab53a3

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.