From c255c8b357a95a8be9dbfb2aca48002f203de14d Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Fri, 12 Apr 2019 14:00:40 -0700
Subject: [PATCH] Unlock the phone before each test

We were trying to do so from the test config, but this didn't work

Change-Id: I098eb392c76572bc43443adac130fa8700b49bde
---
 tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java  | 2 ++
 .../com/android/launcher3/tapl/LauncherInstrumentation.java     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 9e77937ec7..4a9df989c3 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -163,6 +163,8 @@ public abstract class AbstractLauncherUiTest {
     public void setUp() throws Exception {
         mTargetContext = InstrumentationRegistry.getTargetContext();
         mTargetPackage = mTargetContext.getPackageName();
+        // Unlock the phone
+        mDevice.executeShellCommand("input keyevent 82");
     }
 
     @After
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 08f2681ea5..cde68f26ea 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -154,8 +154,6 @@ public final class LauncherInstrumentation {
         } catch (IOException e) {
             fail(e.toString());
         }
-
-        assertTrue("Phone is locked", !hasSystemUiObject("keyguard_status_view"));
     }
 
     Context getContext() {