Merge "A little cleanup of activity manager dumpsys output." (52c46a5f) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -15364,11 +15364,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		printedAnything = needSep = true;
		}
		}
		if (dumpAll) {
		if (mValidateUids.size() > 0) {
		if (dumpUids(pw, dumpPackage, mValidateUids, "UID validation:", needSep)) {
		printedAnything = needSep = true;
		}
		}
		}

		if (mLruProcesses.size() > 0) {
		if (needSep) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -128,13 +128,13 @@ public final class UidRecord {
		}
		sb.append(" procs:");
		sb.append(numProcs);
		sb.append(" curProcStateSeq:");
		sb.append(" seq(");
		sb.append(curProcStateSeq);
		sb.append(" lastNetworkUpdatedProcStateSeq:");
		sb.append(",");
		sb.append(lastNetworkUpdatedProcStateSeq);
		sb.append(" lastDispatchedProcStateSeq:");
		sb.append(",");
		sb.append(lastDispatchedProcStateSeq);
		sb.append("}");
		sb.append(")}");
		return sb.toString();
		}
		}

+14 −4

Original line number	Diff line number	Diff line
		@@ -1965,12 +1965,22 @@ public final class JobSchedulerService extends com.android.server.SystemService
		pw.print(mHandler.isReadyToBeExecutedLocked(job));
		pw.print(" (job=");
		pw.print(job.isReady());
		pw.print(" pending=");
		pw.print(mPendingJobs.contains(job));
		pw.print(" active=");
		pw.print(isCurrentlyActiveLocked(job));
		pw.print(" user=");
		pw.print(ArrayUtils.contains(mStartedUsers, job.getUserId()));
		pw.print(" !pending=");
		pw.print(!mPendingJobs.contains(job));
		pw.print(" !active=");
		pw.print(!isCurrentlyActiveLocked(job));
		pw.print(" comp=");
		boolean componentPresent = false;
		try {
		componentPresent = (AppGlobals.getPackageManager().getServiceInfo(
		job.getServiceComponent(),
		PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
		job.getUserId()) != null);
		} catch (RemoteException e) {
		}
		pw.print(componentPresent);
		pw.println(")");
		}
		} else {