commit 770cc42685e92c0b55c8eebb73869db74602c70e
author Vinit Nayak <peanutbutter@google.com> Wed Apr 15 05:24:10 2020 +0000
committer Vinit Nayak <peanutbutter@google.com> Wed Apr 15 05:24:10 2020 +0000
tree 841ff6b9b16a75c17cb4f2977530810ab42a12ea
parent a2a1f86dfff9bb6d6114020ee58a447b3964af65

Revert "Cleanup code related to ag/11035582"

This reverts commit a2a1f86dfff9bb6d6114020ee58a447b3964af65.

Reason for revert: b/154068414

Change-Id: I1db0018fa97d5a5380651cf7d04a05a0abd62857

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

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 86faddb..a7089fe 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -162,6 +162,7 @@
         mLauncher.enableDebugTracing();
         // Avoid double-reporting of Launcher crashes.
         mLauncher.setOnLauncherCrashed(() -> mLauncherPid = 0);
+        mLauncher.disableSensorRotation();
     }
 
     protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule();
@@ -277,6 +278,7 @@
             clearPackageData(mDevice.getLauncherPackageName());
             mLauncher.enableDebugTracing();
             mLauncherPid = mLauncher.getPid();
+            mLauncher.disableSensorRotation();
         }
     }
 

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

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index af22704..84eae2d 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1265,7 +1265,7 @@
                 TestProtocol.TEST_INFO_RESPONSE_FIELD);
     }
 
-    private void disableSensorRotation() {
+    public void disableSensorRotation() {
         getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
     }