From 0728069542eff23f2fdc2f32c5031462d9d1fd6f Mon Sep 17 00:00:00 2001 From: Timothy Wang Date: Mon, 28 Nov 2022 05:50:07 +0000 Subject: Revert "Fix IME not shown from recents to split-screen task" This reverts commit a210826fe5577d9501da413f569253e6fc9979d8. Reason for revert: DroidMonitor: Potential culprit for Bug b/260534444 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: Id88fe6e3a4f9eea08aa812feaae92067be40950f --- .../android/wm/shell/common/DisplayImeController.java | 2 +- .../wm/shell/common/DisplayImeControllerTest.java | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java index 4edc64266cca..d9b4f475a50c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java @@ -295,8 +295,8 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged mImeSourceControl.release(SurfaceControl::release); } } + mImeSourceControl = imeSourceControl; } - mImeSourceControl = imeSourceControl; } private void applyVisibilityToLeash(InsetsSourceControl imeSourceControl) { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java index 86415419418a..40f2e88f34fd 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java @@ -21,9 +21,7 @@ import static android.view.InsetsState.ITYPE_IME; import static android.view.Surface.ROTATION_0; import static android.view.WindowInsets.Type.ime; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -91,22 +89,6 @@ public class DisplayImeControllerTest extends ShellTestCase { verifyZeroInteractions(mExecutor); } - @Test - public void insetsControlChanged_updateExpectedImeSourceControl() { - final InsetsSourceControl[] insetsSourceControls = new InsetsSourceControl[]{ - new InsetsSourceControl(ITYPE_IME, mock(SurfaceControl.class), false, - new Point(0, 0), Insets.NONE)}; - final InsetsSourceControl imeSourceControl = insetsSourceControls[0]; - - mPerDisplay.insetsControlChanged(insetsStateWithIme(false), insetsSourceControls); - - assertEquals(imeSourceControl, mPerDisplay.mImeSourceControl); - - mPerDisplay.insetsControlChanged(insetsStateWithIme(false), null); - - assertNull(mPerDisplay.mImeSourceControl); - } - @Test public void insetsChanged_schedulesNoWorkOnExecutor() { mPerDisplay.insetsChanged(insetsStateWithIme(false)); -- cgit v1.2.3-59-g8ed1b