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

Commit 35aa2676 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "User workflow log improvements."

parents 3b7af776 508464d5

services/core/java/com/android/server/am/UserController.java

+0 −2
Original line number Diff line number Diff line
@@ -712,8 +712,6 @@ class UserController implements Handler.Callback { 
            Slog.i(TAG, "Stopping pre-created user " + userInfo.toFullString());

            // Pre-created user was started right after creation so services could properly

            // intialize it; it should be stopped right away as it's not really a "real" user.

            // TODO(b/143092698): in the long-term, it might be better to add a onCreateUser()

            // callback on SystemService instead.

            stopUser(userInfo.id, /* force= */ true, /* allowDelayedLocking= */ false,

                    /* stopUserCallback= */ null, /* keyEvictedCallback= */ null);

            return;

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

+5 −2
Original line number Diff line number Diff line
@@ -1729,6 +1729,7 @@ public class UserManagerService extends IUserManager.Stub { 
    }



    public void makeInitialized(@UserIdInt int userId) {

        if (DBG) Slog.d(LOG_TAG, "makeInitialized(" + userId + ")");

        checkManageUsersPermission("makeInitialized");

        boolean scheduleWriteUser = false;

        UserData userData;
@@ -3553,8 +3554,7 @@ public class UserManagerService extends IUserManager.Stub { 
                // Must start user (which will be stopped right away, through

                // UserController.finishUserUnlockedCompleted) so services can properly

                // intialize it.

                // TODO(b/143092698): in the long-term, it might be better to add a onCreateUser()

                // callback on SystemService instead.

                // NOTE: user will be stopped on UserController.finishUserUnlockedCompleted().

                Slog.i(LOG_TAG, "starting pre-created user " + userInfo.toFullString());

                final IActivityManager am = ActivityManager.getService();

                try {
@@ -4965,6 +4965,9 @@ public class UserManagerService extends IUserManager.Stub { 
                        UserData userData = getUserDataNoChecks(userId);

                        if (userData != null) {

                            writeUserLP(userData);

                        } else {

                            Slog.i(LOG_TAG, "handle(WRITE_USER_MSG): no data for user " + userId

                                    + ", it was probably removed before handler could handle it");

                        }

                    }

            }