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

Commit fcdd6503 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev am: 26e995aa am: 874b9864

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



Change-Id: Ib240406fa7ddefe25338faf6c91d01fc45f93c60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 194a0138 874b9864

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

+1 −1
Original line number Diff line number Diff line
@@ -4333,7 +4333,7 @@ public class UserManagerService extends IUserManager.Stub { 
        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());