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

Commit 60e6e538 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Show user running state in dumpsys user." into oc-dev 

am: 2692dafa

Change-Id: Id0b7b4fe09fe9165c9746b7906ce2247a59b7720
parents 31f7a285 2692dafa

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public final class UserState { 
        state = newState;

    }



    static String stateToString(int state) {

    public static String stateToString(int state) {

        switch (state) {

            case STATE_BOOTING: return "BOOTING";

            case STATE_RUNNING_LOCKED: return "RUNNING_LOCKED";

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

+6 −0
Original line number Diff line number Diff line
@@ -3389,6 +3389,12 @@ public class UserManagerService extends IUserManager.Stub { 
                        pw.print(" <partial>");

                    }

                    pw.println();

                    pw.print("    State: ");

                    final int state;

                    synchronized (mUserStates) {

                        state = mUserStates.get(userId, -1);

                    }

                    pw.println(UserState.stateToString(state));

                    pw.print("    Created: ");

                    if (userInfo.creationTime == 0) {

                        pw.println("<unknown>");