Merge "Clear LastSurfacePosition when surface is cleared." (20648f2d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowContainer.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -490,6 +490,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		}

		mSurfaceControl = null;
		mLastSurfacePosition.set(0, 0);
		scheduleAnimation();
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,32 @@ public class WindowContainerTests extends WindowTestsBase {
		assertEquals(0, root.getChildrenCount());
		}

		@Test
		public void testRemoveImmediatelyClearsLastSurfacePosition() {
		reset(mTransaction);
		try (MockSurfaceBuildingContainer top = new MockSurfaceBuildingContainer(mWm)) {
		final WindowContainer<WindowContainer> child1 = new WindowContainer(mWm);
		child1.setBounds(1, 1, 10, 10);

		top.addChild(child1, 0);
		assertEquals(1, child1.getLastSurfacePosition().x);
		assertEquals(1, child1.getLastSurfacePosition().y);

		WindowContainer child11 = new WindowContainer(mWm);
		child1.addChild(child11, 0);

		child1.setBounds(2, 2, 20, 20);
		assertEquals(2, child1.getLastSurfacePosition().x);
		assertEquals(2, child1.getLastSurfacePosition().y);

		child1.removeImmediately();
		assertEquals(0, child1.getLastSurfacePosition().x);
		assertEquals(0, child1.getLastSurfacePosition().y);
		assertEquals(0, child11.getLastSurfacePosition().x);
		assertEquals(0, child11.getLastSurfacePosition().y);
		}
		}

		@Test
		public void testAddChildByIndex() {
		final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(mWm);