diff options
| author | 2017-03-30 15:18:25 +0000 | |
|---|---|---|
| committer | 2017-03-30 15:18:28 +0000 | |
| commit | 2692dafa9b78ef22bc685da3ae46198abdd9b0e8 (patch) | |
| tree | 45f827f9f4752bc9498c4a953a821ef0216d9f05 | |
| parent | f451f7b05ba5b5be9098ffaba51c092e2a482119 (diff) | |
| parent | 88aef7560531601bdb7647bc6bd1fa0e0a320092 (diff) | |
Merge "Show user running state in dumpsys user." into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/UserState.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/UserState.java b/services/core/java/com/android/server/am/UserState.java index 6710bdc3cd2d..9970c82e2c75 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 a31258c39341..8ecf6f74bc8f 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>"); |