diff options
6 files changed, 6 insertions, 74 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java index c072d4e28e81..83c0af92a6ee 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java @@ -59,7 +59,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { public void setUpOnDisplay(DisplayContent dc) { mStack = createTaskStackOnDisplay(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, dc); mTask = createTaskInStack(mStack, 0 /* userId */); - mToken = WindowTestUtils.createTestAppWindowToken(dc, false /* skipOnParentChanged */); + mToken = WindowTestUtils.createTestAppWindowToken(dc); mTask.addChild(mToken, 0); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java index a98a6046890d..db04f1159150 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java @@ -60,7 +60,7 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase { MockitoAnnotations.initMocks(this); mToken = createTestAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN, - ACTIVITY_TYPE_STANDARD, false /* skipOnParentChanged */); + ACTIVITY_TYPE_STANDARD); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java index 68b40b92b9cc..70c8c937c481 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java @@ -81,8 +81,7 @@ public class AppWindowTokenTests extends WindowTestsBase { public void setUp() throws Exception { mStack = createTaskStackOnDisplay(mDisplayContent); mTask = createTaskInStack(mStack, 0 /* userId */); - mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent, - false /* skipOnParentChanged */); + mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent); mTask.addChild(mToken, 0); } @@ -219,9 +218,6 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test public void testSizeCompatBounds() { - // The real surface transaction is unnecessary. - mToken.setSkipPrepareSurfaces(true); - final Rect fixedBounds = mToken.getRequestedOverrideConfiguration().windowConfiguration .getBounds(); fixedBounds.set(0, 0, 1200, 1600); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java index 0dec8ee7776f..a7a785d14d6a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java @@ -56,24 +56,15 @@ class WindowTestUtils { static TestAppWindowToken createTestAppWindowToken(DisplayContent dc) { synchronized (dc.mWmService.mGlobalLock) { - return new TestAppWindowToken(dc, true /* skipOnParentChanged */); - } - } - - static TestAppWindowToken createTestAppWindowToken(DisplayContent dc, - boolean skipOnParentChanged) { - synchronized (dc.mWmService.mGlobalLock) { - return new TestAppWindowToken(dc, skipOnParentChanged); + return new TestAppWindowToken(dc); } } /** Used so we can gain access to some protected members of the {@link AppWindowToken} class. */ static class TestAppWindowToken extends AppWindowToken { boolean mOnTop = false; - private boolean mSkipPrepareSurfaces; - boolean mSkipOnParentChanged = true; - private TestAppWindowToken(DisplayContent dc, boolean skipOnParentChanged) { + private TestAppWindowToken(DisplayContent dc) { super(dc.mWmService, new IApplicationToken.Stub() { @Override public String getName() { @@ -81,7 +72,6 @@ class WindowTestUtils { } }, new ComponentName("", ""), false, dc, true /* fillsParent */); mTargetSdk = Build.VERSION_CODES.CUR_DEVELOPMENT; - mSkipOnParentChanged = skipOnParentChanged; mActivityRecord = mock(ActivityRecord.class); mActivityRecord.app = mock(WindowProcessController.class); } @@ -103,44 +93,10 @@ class WindowTestUtils { } @Override - void onParentChanged() { - if (!mSkipOnParentChanged) { - super.onParentChanged(); - } else { - updateConfigurationFromParent(this); - } - } - - @Override boolean isOnTop() { return mOnTop; } - @Override - void prepareSurfaces() { - if (!mSkipPrepareSurfaces) { - super.prepareSurfaces(); - } - } - - void setSkipPrepareSurfaces(boolean ignore) { - mSkipPrepareSurfaces = ignore; - } - } - - /** - * Used when we don't want to perform surface related operation in - * {@link WindowContainer#onParentChanged} or the overridden method, but the configuration - * still needs to propagate from parent. - * - * @see ConfigurationContainer#onParentChanged - */ - static void updateConfigurationFromParent(WindowContainer container) { - final WindowContainer parent = container.getParent(); - if (parent != null) { - container.onConfigurationChanged(parent.getConfiguration()); - container.onMergedOverrideConfigurationChanged(); - } } static TestWindowToken createTestWindowToken(int type, DisplayContent dc) { @@ -246,10 +202,5 @@ class WindowTestUtils { mHasSurface = hadSurface; } - - @Override - void onParentChanged() { - updateConfigurationFromParent(this); - } } } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 032eba17a6b5..fb698d92db20 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -269,16 +269,10 @@ class WindowTestsBase { WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int windowingMode, int activityType) { - return createTestAppWindowToken(dc, windowingMode, activityType, - false /*skipOnParentChanged */); - } - - WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int - windowingMode, int activityType, boolean skipOnParentChanged) { final TaskStack stack = createTaskStackOnDisplay(windowingMode, activityType, dc); final Task task = createTaskInStack(stack, 0 /* userId */); final WindowTestUtils.TestAppWindowToken appWindowToken = - WindowTestUtils.createTestAppWindowToken(dc, skipOnParentChanged); + WindowTestUtils.createTestAppWindowToken(dc); task.addChild(appWindowToken, 0); return appWindowToken; } diff --git a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java index 2fc6efa3313c..7d7c398554dd 100644 --- a/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java @@ -43,7 +43,6 @@ import android.platform.test.annotations.Presubmit; import android.view.SurfaceControl; import android.view.SurfaceSession; -import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import org.junit.After; @@ -212,7 +211,6 @@ public class ZOrderingTests extends WindowTestsBase { return createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, name); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForImeWithNoTarget() { mDisplayContent.mInputMethodTarget = null; @@ -230,7 +228,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForImeWithAppTarget() { final WindowState imeAppTarget = createWindow("imeAppTarget"); @@ -250,7 +247,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForImeWithAppTargetWithChildWindows() { final WindowState imeAppTarget = createWindow("imeAppTarget"); @@ -277,7 +273,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() { final WindowState appBelowImeTarget = createWindow("appBelowImeTarget"); @@ -301,7 +296,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForImeNonAppImeTarget() { final WindowState imeSystemOverlayTarget = createWindow(null, TYPE_SYSTEM_OVERLAY, @@ -329,7 +323,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testAssignWindowLayers_ForStatusBarImeTarget() { mDisplayContent.mInputMethodTarget = mStatusBarWindow; @@ -344,7 +337,6 @@ public class ZOrderingTests extends WindowTestsBase { assertWindowHigher(mImeDialogWindow, mImeWindow); } - @FlakyTest(bugId = 124088319) @Test public void testStackLayers() { final WindowState anyWindow1 = createWindow("anyWindow"); @@ -432,7 +424,6 @@ public class ZOrderingTests extends WindowTestsBase { } } - @FlakyTest(bugId = 124088319) @Test public void testDockedDividerPosition() { final WindowState pinnedStackWindow = createWindowOnStack(null, WINDOWING_MODE_PINNED, |