From 770cc42685e92c0b55c8eebb73869db74602c70e Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 15 Apr 2020 05:24:10 +0000 Subject: [PATCH] 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 | 2 ++ .../com/android/launcher3/tapl/LauncherInstrumentation.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 86faddb41d..a7089fef15 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/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(); } } diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index af22704cb2..84eae2d793 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/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); }