Merge "Fix formatting of ANRs." (3d4178fe) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -4638,11 +4638,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		if (activity != null && activity.shortComponentName != null) {
		info.append(" (").append(activity.shortComponentName).append(")");
		}
		info.append("\n");
		if (annotation != null) {
		info.append("\nReason: ").append(annotation).append("\n");
		info.append("Reason: ").append(annotation).append("\n");
		}
		if (parent != null && parent != activity) {
		info.append("\nParent: ").append(parent.shortComponentName);
		info.append("Parent: ").append(parent.shortComponentName).append("\n");
		}

		String cpuInfo = null;