Merge "Protect spy by holding lock" (a59ffcd1) · Commits · e / os / android_frameworks_base

services/tests/wmtests/src/com/android/server/wm/TaskPositioningControllerTests.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import static org.junit.Assert.assertTrue;
		import android.platform.test.annotations.Presubmit;
		import android.view.InputChannel;

		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.SmallTest;

		import org.junit.Before;
		@@ -60,11 +61,10 @@ public class TaskPositioningControllerTests extends WindowTestsBase {
		mWindow.mInputChannel = new InputChannel();
		synchronized (mWm.mGlobalLock) {
		mWm.mWindowMap.put(mWindow.mClient.asBinder(), mWindow);
		}

		spyOn(mDisplayContent);
		doReturn(mock(InputMonitor.class)).when(mDisplayContent).getInputMonitor();
		}
		}

		@Test
		public void testStartAndFinishPositioning() {
		@@ -88,6 +88,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase {
		assertNull(mTarget.getDragWindowHandleLocked());
		}

		@FlakyTest(bugId = 129331490)
		@Test
		public void testHandleTapOutsideTask() {
		synchronized (mWm.mGlobalLock) {