Merge "Slightly improve historical app opp dumping" (42b3aa41) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/HistoricalRegistry.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -1454,8 +1454,8 @@ final class HistoricalRegistry {
		if (accessCount > 0) {
		if (!printedUidState) {
		mWriter.print(mUidStatePrefix);
		mWriter.print(AppOpsManager.uidStateToString(uidState));
		mWriter.print("[");
		mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
		mWriter.print(" = ");
		printedUidState = true;
		}
		mWriter.print("access=");
		@@ -1465,8 +1465,8 @@ final class HistoricalRegistry {
		if (rejectCount > 0) {
		if (!printedUidState) {
		mWriter.print(mUidStatePrefix);
		mWriter.print(AppOpsManager.uidStateToString(uidState));
		mWriter.print("[");
		mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
		mWriter.print(" = ");
		printedUidState = true;
		} else {
		mWriter.print(", ");
		@@ -1478,16 +1478,17 @@ final class HistoricalRegistry {
		if (accessDuration > 0) {
		if (!printedUidState) {
		mWriter.print(mUidStatePrefix);
		mWriter.print(AppOpsManager.uidStateToString(uidState));
		mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
		mWriter.print(" = ");
		printedUidState = true;
		} else {
		mWriter.print(", ");
		}
		mWriter.print("duration=");
		mWriter.print(accessDuration);
		TimeUtils.formatDuration(accessDuration, mWriter);
		}
		if (printedUidState) {
		mWriter.println("]");
		mWriter.println("");
		}
		}
		}