Merge "Revert "Cleanup code related to ag/11035582"" into ub-launcher3-rvc-dev

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

@@ -162,6 +162,7 @@ public abstract class AbstractLauncherUiTest {
         mLauncher.enableDebugTracing();
         // Avoid double-reporting of Launcher crashes.
         mLauncher.setOnLauncherCrashed(() -> mLauncherPid = 0);
+        mLauncher.disableSensorRotation();
     }
 
     protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule();
@@ -277,6 +278,7 @@ public abstract class AbstractLauncherUiTest {
             clearPackageData(mDevice.getLauncherPackageName());
             mLauncher.enableDebugTracing();
             mLauncherPid = mLauncher.getPid();
+            mLauncher.disableSensorRotation();
         }
     }
 

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

@@ -1265,7 +1265,7 @@ public final class LauncherInstrumentation {
                 TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
-    private void disableSensorRotation() {
+    public void disableSensorRotation() {
         getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
     }