commit df0e6abd9f5863740942a1da12685f261016a8e1
author Kenny Root <kroot@google.com> Wed Jul 03 13:38:31 2013 -0700
committer Kenny Root <kroot@google.com> Wed Jul 03 13:40:16 2013 -0700
tree dc6b863a3e937aee714511ed50be153da9eaed16
parent d04f864ad2aedf5365edde8b754d1d844a80ca81

KeySetManager: add keyset aliases to dump

Add the list of aliases defined to the dumpsys output.

Change-Id: I8bba20fba8dd123f749372cab7b8f038aa47331f

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

diff --git a/services/java/com/android/server/pm/KeySetManager.java b/services/java/com/android/server/pm/KeySetManager.java
index cc2473b..564b8eb 100644
--- a/services/java/com/android/server/pm/KeySetManager.java
+++ b/services/java/com/android/server/pm/KeySetManager.java
@@ -418,6 +418,21 @@
                 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: ");
@@ -433,12 +448,12 @@
                     printedLabel = false;
                     for (long keySetId : pkg.keySetData.getSigningKeySets()) {
                         if (!printedLabel) {
-                            pw.print("      Signing KeySets:");
+                            pw.print("      Signing KeySets: ");
                             printedLabel = true;
                         } else {
                             pw.print(", ");
                         }
-                        pw.print(" "); pw.print(Long.toString(keySetId));
+                        pw.print(Long.toString(keySetId));
                     }
                     if (printedLabel) {
                         pw.println("");