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

Commit 6234621a authored by William Loh's avatar William Loh Committed by Automerger Merge Worker
Browse files

Merge "Fix pm create-user when creating user with profile of cur" into tm-dev am: 0791182e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17510289



Change-Id: Ia6fc7aba3d47a83a0877bc10b3723678eba9c237
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65cd3915 0791182e

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+2 −1
Original line number Diff line number Diff line
@@ -2675,7 +2675,8 @@ class PackageManagerShellCommand extends ShellCommand { 
        while ((opt = getNextOption()) != null) {

            String newUserType = null;

            if ("--profileOf".equals(opt)) {

                userId = UserHandle.parseUserArg(getNextArgRequired());

                userId = translateUserId(UserHandle.parseUserArg(getNextArgRequired()),

                            UserHandle.USER_ALL, "runCreateUser");

            } else if ("--managed".equals(opt)) {

                newUserType = UserManager.USER_TYPE_PROFILE_MANAGED;

            } else if ("--restricted".equals(opt)) {