commit 1af6be57c83e161b2641acbb58f62a7236c345d5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 20 23:20:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 20 23:20:57 2020 +0000
tree 4d3566943b8584ce0e09558a880cc6fc03e0ecbb
parent 7d3a113d053a1516c90bba176394b2a97366528d
parent 1b4247d9cd6c2f2d10338a0441683bcf362bd267

Merge "Disable battery defender to avoid locking during the test" into ub-launcher3-master

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 f5dd995..551b533 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -220,6 +220,7 @@
 
     @Before
     public void setUp() throws Exception {
+        mDevice.executeShellCommand("setprop vendor.battery.defender.disable 1");
         mDevice.executeShellCommand("settings put global stay_on_while_plugged_in 3");
         if (hasSystemUiObject("keyguard_status_view")) {
             Log.d(TAG, "Before unlocking the phone");