Merge "Remove tests for impossible conditions" into main

1 files changed, 0 insertions, 20 deletions

diff --git a/core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java b/core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java
index e0823b874edf..d6b2a782bc0c 100644
--- a/core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java
+++ b/core/tests/coretests/src/com/android/internal/jank/InteractionJankMonitorTest.java
@@ -24,7 +24,6 @@ import static com.android.internal.jank.InteractionJankMonitor.Configuration.gen
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -190,25 +189,6 @@ public class InteractionJankMonitorTest {
         assertThat(generateSessionName(cujName, tooLongTag)).isEqualTo(expectedTrimmedName);
     }
 
-    @Test
-    public void validateConfiguration_surfaceOnlyAndNotDeferMonitor_throwsError() {
-        Configuration.Builder builder = Configuration.Builder.withSurface(1,
-                mActivity.getApplicationContext(), mSurfaceControl,
-                mActivity.getMainThreadHandler()).setDeferMonitorForAnimationStart(false);
-
-        assertThrows(IllegalStateException.class, builder::build);
-    }
-
-    @Test
-    public void validateConfiguration_surfaceOnlyAndDeferMonitor_doesNotThrowError() {
-        Configuration.Builder builder = Configuration.Builder.withSurface(1,
-                mActivity.getApplicationContext(),
-                mSurfaceControl, mActivity.getMainThreadHandler()).setDeferMonitorForAnimationStart(
-                true);
-
-        builder.build(); // no exception.
-    }
-
     private InteractionJankMonitor createMockedInteractionJankMonitor() {
         InteractionJankMonitor monitor = spy(new InteractionJankMonitor(mWorker));
         doReturn(true).when(monitor).shouldMonitor();