From 2b26fe28155ed8dcbab075b5922ae0bf6af42f84 Mon Sep 17 00:00:00 2001 From: William Loh Date: Wed, 30 Mar 2022 19:08:23 +0000 Subject: [PATCH] Fix pm create-user when creating user with profile of cur Use translateUserId to convert USER_CURRENT to the actual current user id when creating a user with cur or current. Bug: 191043371 Test: adb shell pm create-user succesfully creates with current as profile Change-Id: Idfbf65b3afee2aa7db627e9b46abd8a025e4e8ab --- .../java/com/android/server/pm/PackageManagerShellCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 581e4e26da81e..f3b06e8f918c7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -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)) {