Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6ce152 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Removing users synchronously" into main

parents c1de0656 2c722719

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+2 −1
Original line number Diff line number Diff line
@@ -300,7 +300,8 @@ public abstract class AbstractLauncherUiTest<LAUNCHER_TYPE extends Launcher> { 
        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());

                }

            }

        }

tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest<Launcher> { 
        mLauncher.runToState(

                () -> {

                    try {

                        mDevice.executeShellCommand("pm remove-user " + mProfileUserId);

                        mDevice.executeShellCommand("pm remove-user --wait " + mProfileUserId);

                    } catch (IOException e) {

                        throw new RuntimeException(e);

                    }