commit 416502831f87cd98414a7cdd294e698e803b56b9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 29 21:27:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 29 21:27:29 2022 +0000
tree fa08952a79380b3cf68548dc43cbd05ece4bd799
parent 03d7a23d36a0ba278c7aa6af310c72a20f87fa24
parent 8cce6d422bb9d230bab97633f9af9033c5cfb01c

Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users."

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

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 075275a..be7e2da 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -3966,7 +3966,7 @@
         for (int i = 0; i < userSize; i++) {
             final UserData user = mUsers.valueAt(i);
             if (DBG) Slog.d(LOG_TAG, i + ":" + user.info.toFullString());
-            if (user.info.preCreated && user.info.userType.equals(userType)) {
+            if (user.info.preCreated && !user.info.partial && user.info.userType.equals(userType)) {
                 if (!user.info.isInitialized()) {
                     Slog.w(LOG_TAG, "found pre-created user of type " + userType
                             + ", but it's not initialized yet: " + user.info.toFullString());