| commit | b5379dc5f4d2d757f90288688f7057ca52c22701 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 02 14:31:07 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 02 14:31:10 2017 +0000 |
| tree | 4b8f17834a5f499ad72da5eee3d7582e2d5a4dbe | |
| parent | b0f658efd7a85a6be8d8aa655bd55ea490842faf [diff] | |
| parent | 564d09a3c67dc54dcee9ad126eb251f31e82643d [diff] |
Merge "CTS Keyguard*Tests don't assume screenlock" into oc-dev
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java index a6a7cd8..89bbb07 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java
@@ -25,6 +25,22 @@ */ public class KeyguardTests extends KeyguardTestBase { + @Override + public void setUp() throws Exception { + super.setUp(); + + // Set screen lock (swipe) + mDevice.executeShellCommand("locksettings set-disabled false"); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + + // Remove screen lock + mDevice.executeShellCommand("locksettings set-disabled true"); + } + public void testKeyguardHidesActivity() throws Exception { if (!isHandheld()) { return;
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java index e67cdd9..05065aa 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java
@@ -28,6 +28,22 @@ */ public class KeyguardTransitionTests extends ActivityManagerTestBase { + @Override + public void setUp() throws Exception { + super.setUp(); + + // Set screen lock (swipe) + mDevice.executeShellCommand("locksettings set-disabled false"); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + + // Remove screen lock + mDevice.executeShellCommand("locksettings set-disabled true"); + } + public void testUnlock() throws Exception { if (!isHandheld()) { return;