From 2c7227191523ba9717fb5fdbbc98802091eff48f Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Thu, 11 Apr 2024 15:58:33 -0700 Subject: [PATCH] Removing users synchronously Bug: 302400996 Test: presubmit Flag: N/A Change-Id: Iac1863039cbb9d612abe416b7aee135eec25f223 --- tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 3 ++- tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index d8635f9071..5966f310b7 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -300,7 +300,8 @@ public abstract class AbstractLauncherUiTest { if (userManager != null) { for (UserHandle userHandle : userManager.getUserProfiles()) { if (!userHandle.isSystem()) { - mDevice.executeShellCommand("pm remove-user " + userHandle.getIdentifier()); + mDevice.executeShellCommand( + "pm remove-user --wait " + userHandle.getIdentifier()); } } } diff --git a/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java index eb1f49ff11..e0385f46c0 100644 --- a/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java @@ -113,7 +113,7 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest { mLauncher.runToState( () -> { try { - mDevice.executeShellCommand("pm remove-user " + mProfileUserId); + mDevice.executeShellCommand("pm remove-user --wait " + mProfileUserId); } catch (IOException e) { throw new RuntimeException(e); }