Merge "KeySetManager: add keyset aliases to dump" (978263ee) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/KeySetManager.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -418,6 +418,21 @@ public class KeySetManager {
		pw.print(" ["); pw.print(keySetPackage); pw.println("]");
		if (pkg.keySetData != null) {
		boolean printedLabel = false;
		for (Entry<String, Long> entry : pkg.keySetData.getAliases().entrySet()) {
		if (!printedLabel) {
		pw.print(" KeySets Aliases: ");
		printedLabel = true;
		} else {
		pw.print(", ");
		}
		pw.print(entry.getKey());
		pw.print('=');
		pw.print(Long.toString(entry.getValue()));
		}
		if (printedLabel) {
		pw.println("");
		}
		printedLabel = false;
		for (long keySetId : pkg.keySetData.getDefinedKeySets()) {
		if (!printedLabel) {
		pw.print(" Defined KeySets: ");
		@@ -438,7 +453,7 @@ public class KeySetManager {
		} else {
		pw.print(", ");
		}
		pw.print(" "); pw.print(Long.toString(keySetId));
		pw.print(Long.toString(keySetId));
		}
		if (printedLabel) {
		pw.println("");