From 88aef7560531601bdb7647bc6bd1fa0e0a320092 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 29 Mar 2017 16:52:03 -0700
Subject: [PATCH] Show user running state in dumpsys user.

Test: Manual test with: watch adb shell dumpsys user
Change-Id: I38f36331b95e2602b09d60bee75a65f62cf85a86
---
 services/core/java/com/android/server/am/UserState.java     | 2 +-
 .../core/java/com/android/server/pm/UserManagerService.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/UserState.java b/services/core/java/com/android/server/am/UserState.java
index 6710bdc3cd2d4..9970c82e2c75f 100644
--- a/services/core/java/com/android/server/am/UserState.java
+++ b/services/core/java/com/android/server/am/UserState.java
@@ -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";
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index a31258c393417..8ecf6f74bc8f0 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -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>");