Merge "Improvements on 'dumpsys activity' for users:" (a9810f66) · Commits · e / os / android_frameworks_base

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -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);

		@@ -11092,6 +11095,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		pw.println(" mForceBackgroundCheck=" + mForceBackgroundCheck);
		}

		@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;

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}