commit 44fccd2daa61527112b1bd56ed258b91fe52a0c3
author Liana Kazanova <lkazanova@google.com> Wed Sep 13 20:26:46 2023 +0000
committer Liana Kazanova <lkazanova@google.com> Wed Sep 13 20:26:46 2023 +0000
tree 8d342e7d05228998d4fe65dc3d525fe89cf04854
parent 69b81cf936730a2c1b9ecfd9623235bb2f4deb69

Revert "Un-ignore the testBackNavigation after depending in UiAu..."

Revert submission 24733912

Reason for revert: Potential culprit for b/300305372 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:24733912

Change-Id: I46c0292bf8694f700249965f8a4236e6030e833c

sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java

diff --git a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
index 54ce3e4..edf69b2 100644
--- a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
+++ b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
@@ -772,13 +772,9 @@
         assertThat(clearTopActivityStarter.isActivityResumed()).isTrue();
     }
 
-    /**
-     * Ensure that SDK can lock back navigation
-     *
-     * @throws RemoteException
-     */
     @Test
-    public void testBackNavigationControl() throws RemoteException {
+    @Ignore("b/298171583")
+    public void testBackNavigation() throws Exception {
         assumeTrue(SdkLevel.isAtLeastU());
 
         ICtsSdkProviderApi sdk = loadSdk();
@@ -789,17 +785,21 @@
         assertThat(mScenario.getState()).isIn(Arrays.asList(State.CREATED, State.STARTED));
         assertThat(sandboxActivityStarter.isActivityResumed()).isTrue();
 
-        actionExecutor.disableBackButton();
+        try {
+            actionExecutor.disableBackButton();
+        } catch (RemoteException e) {
+            fail("Error while disabling back button: " + e.getMessage());
+        }
         sUiDevice.pressBack();
-        assertFalse(
-                sUiDevice.wait(Until.hasObject(By.text("DEFAULT_SHOW_TEXT")), WAIT_FOR_TEXT_IN_MS));
         assertThat(mScenario.getState()).isIn(Arrays.asList(State.CREATED, State.STARTED));
         assertThat(sandboxActivityStarter.isActivityResumed()).isTrue();
 
-        actionExecutor.enableBackButton();
+        try {
+            actionExecutor.enableBackButton();
+        } catch (RemoteException e) {
+            fail("Error while enabling back button: " + e.getMessage());
+        }
         sUiDevice.pressBack();
-        assertTrue(
-                sUiDevice.wait(Until.hasObject(By.text("DEFAULT_SHOW_TEXT")), WAIT_FOR_TEXT_IN_MS));
         assertThat(mScenario.getState()).isEqualTo(State.RESUMED);
         assertThat(sandboxActivityStarter.isActivityResumed()).isFalse();
     }