diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 21 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/UserController.java | 6 |
2 files changed, 20 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5b7a8148d694..770db58773eb 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -10116,6 +10116,11 @@ public class ActivityManagerService extends IActivityManager.Stub pw.println("-------------------------------------------------------------------------------"); } dumpProcessesLocked(fd, pw, args, opti, dumpAll, dumpPackage, dumpAppId); + pw.println(); + if (dumpAll) { + pw.println("-------------------------------------------------------------------------------"); + } + dumpUsersLocked(pw); } } @@ -10404,6 +10409,10 @@ public class ActivityManagerService extends IActivityManager.Stub } } else if ("locks".equals(cmd)) { LockGuard.dump(fd, pw, args); + } else if ("users".equals(cmd)) { + synchronized (this) { + dumpUsersLocked(pw); + } } else { // Dumping a single activity? if (!mAtmInternal.dumpActivity(fd, pw, cmd, args, opti, dumpAll, @@ -10878,12 +10887,6 @@ public class ActivityManagerService extends IActivityManager.Stub needSep = mAppErrors.dumpLocked(fd, pw, needSep, dumpPackage); - if (dumpPackage == null) { - pw.println(); - needSep = false; - mUserController.dump(pw, dumpAll); - } - needSep = mAtmInternal.dumpForProcesses(fd, pw, dumpAll, dumpPackage, dumpAppId, needSep, mTestPssMode, mWakefulness); @@ -11093,6 +11096,12 @@ public class ActivityManagerService extends IActivityManager.Stub } @GuardedBy("this") + private void dumpUsersLocked(PrintWriter pw) { + pw.println("ACTIVITY MANAGER USERS (dumpsys activity users)"); + mUserController.dump(pw); + } + + @GuardedBy("this") void writeProcessesToProtoLocked(ProtoOutputStream proto, String dumpPackage) { int numPers = 0; diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 31ceb38d1607..53ac4ec2aab7 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -2130,7 +2130,7 @@ class UserController implements Handler.Callback { } } - void dump(PrintWriter pw, boolean dumpAll) { + void dump(PrintWriter pw) { synchronized (mLock) { pw.println(" mStartedUsers:"); for (int i = 0; i < mStartedUsers.size(); i++) { @@ -2164,7 +2164,11 @@ class UserController implements Handler.Callback { } } pw.println(" mCurrentUserId:" + mCurrentUserId); + pw.println(" mTargetUserId:" + mTargetUserId); pw.println(" mLastActiveUsers:" + mLastActiveUsers); + pw.println(" mDelayUserDataLocking:" + mDelayUserDataLocking); + pw.println(" mMaxRunningUsers:" + mMaxRunningUsers); + pw.println(" mUserSwitchUiEnabled:" + mUserSwitchUiEnabled); } } |