Add sleep time between 2 user switch to avoid system crash
Bug: 200725151
Test: local
Change-Id: I1c9b09d98b18f644357b022c2d6333dac2935fa2
diff --git a/tests/automotive/functional/multiuser/src/android/platform/tests/DeleteCurrentNonAdminUser.java b/tests/automotive/functional/multiuser/src/android/platform/tests/DeleteCurrentNonAdminUser.java
index b2751ba..2858e72 100644
--- a/tests/automotive/functional/multiuser/src/android/platform/tests/DeleteCurrentNonAdminUser.java
+++ b/tests/automotive/functional/multiuser/src/android/platform/tests/DeleteCurrentNonAdminUser.java
@@ -18,6 +18,7 @@
import static junit.framework.Assert.assertTrue;
+import android.os.SystemClock;
import android.content.pm.UserInfo;
import android.platform.helpers.AutoConfigConstants;
import android.platform.helpers.AutoUtility;
@@ -40,6 +41,7 @@
@RunWith(AndroidJUnit4.class)
public class DeleteCurrentNonAdminUser {
+ private static final int WAIT_TIME = 60000;
private final MultiUserHelper mMultiUserHelper = MultiUserHelper.getInstance();
private HelperAccessor<IAutoUserHelper> mUsersHelper;
private HelperAccessor<IAutoSettingHelper> mSettingHelper;
@@ -75,6 +77,7 @@
mUsersHelper.get().deleteCurrentUser();
// goes to guest user, switch back to initial user
UserInfo guestUser = mMultiUserHelper.getCurrentForegroundUserInfo();
+ SystemClock.sleep(WAIT_TIME);
mMultiUserHelper.switchAndWaitForStable(
initialUser.id, MultiUserConstants.WAIT_FOR_IDLE_TIME_MS);
// verify that user is deleted
diff --git a/tests/automotive/functional/multiuser/src/android/platform/tests/SwitchToGuestFromNonAdmin.java b/tests/automotive/functional/multiuser/src/android/platform/tests/SwitchToGuestFromNonAdmin.java
index c18347e..4e7cf31 100644
--- a/tests/automotive/functional/multiuser/src/android/platform/tests/SwitchToGuestFromNonAdmin.java
+++ b/tests/automotive/functional/multiuser/src/android/platform/tests/SwitchToGuestFromNonAdmin.java
@@ -18,6 +18,7 @@
import static junit.framework.Assert.assertTrue;
+import android.os.SystemClock;
import android.content.pm.UserInfo;
import android.platform.helpers.AutoConfigConstants;
import android.platform.helpers.AutoUtility;
@@ -41,6 +42,7 @@
public class SwitchToGuestFromNonAdmin {
private static final String guestUser = MultiUserConstants.GUEST_NAME;
+ private static final int WAIT_TIME = 60000;
private final MultiUserHelper mMultiUserHelper = MultiUserHelper.getInstance();
private HelperAccessor<IAutoUserHelper> mUsersHelper;
private HelperAccessor<IAutoSettingHelper> mSettingHelper;
@@ -78,6 +80,7 @@
UserInfo currentUser = mMultiUserHelper.getCurrentForegroundUserInfo();
assertTrue(currentUser.name.equals(guestUser));
// switch to initial user and delete new user before terminating the test
+ SystemClock.sleep(WAIT_TIME);
mMultiUserHelper.switchAndWaitForStable(
initialUser.id, MultiUserConstants.WAIT_FOR_IDLE_TIME_MS);
mMultiUserHelper.removeUser(newUser);
