commit b191ac91143ba05bf69d861b34b42bb52dc04ea0
author Sungmin Lee <insight.lee@lge.com> Thu Mar 07 14:38:01 2019 +0900
committer Sungmin Lee <insight.lee@lge.com> Sun Mar 10 23:52:27 2019 +0000
tree 7f1813eed07743f036c253699aeeebe02953a701
parent 4bfe8b808bbadf960222ffdd2f413da6e929c85d

Fix CTS testLockTaskAfterReboot_tryOpeningSettings_deviceOwnerUser

1. testLockTaskAfterReboot_tryOpeningSettings_deviceOwnerUser starts
   android.settings.SETTINGS after ADB connection then it causes
   test failed.

2. This change makes CTS wait until kiosk mode working.

Test: run CTS testLockTaskAfterReboot_tryOpeningSettings_deviceOwnerUser
Bug: 127423609

Change-Id: I4ddc6d905b13ecb9d28188e6800990e557ad67e8
Signed-off-by: Sungmin Lee <insight.lee@lge.com>

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index 28dd552..49ff2b4 100755
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
@@ -560,7 +560,7 @@
                     mPrimaryUserId);
 
             // Reboot while in kiosk mode and then unlock the device
-            getDevice().reboot();
+            rebootAndWaitUntilReady();
 
             // Try to open settings via adb
             executeShellCommand("am start -a android.settings.SETTINGS");