commit b541f09be309f5f314760ff832bda245e6ec9cdd
author Christopher Tate <ctate@google.com> Wed Sep 03 23:33:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 03 23:33:05 2014 +0000
tree 82e6acb1d256560be4a1c39fd3dc56d267a01023
parent 8c07e8d2a370a6d59dfe5150af3b07ff031ac165
parent 6441bc7e5366610771b587a8cb6ff04c2861b7a5

Merge "Fix crash in KeySet dump" into lmp-dev

services/core/java/com/android/server/pm/KeySetManagerService.java

diff --git a/services/core/java/com/android/server/pm/KeySetManagerService.java b/services/core/java/com/android/server/pm/KeySetManagerService.java
index 37bedf3..4a8e318 100644
--- a/services/core/java/com/android/server/pm/KeySetManagerService.java
+++ b/services/core/java/com/android/server/pm/KeySetManagerService.java
@@ -538,14 +538,17 @@
                     pw.println("");
                 }
                 printedLabel = false;
-                for (long keySetId : pkg.keySetData.getSigningKeySets()) {
-                    if (!printedLabel) {
-                        pw.print("      Signing KeySets: ");
-                        printedLabel = true;
-                    } else {
-                        pw.print(", ");
+                final long[] signingKeySets = pkg.keySetData.getSigningKeySets();
+                if (signingKeySets != null) {
+                    for (long keySetId : signingKeySets) {
+                        if (!printedLabel) {
+                            pw.print("      Signing KeySets: ");
+                            printedLabel = true;
+                        } else {
+                            pw.print(", ");
+                        }
+                        pw.print(Long.toString(keySetId));
                     }
-                    pw.print(Long.toString(keySetId));
                 }
                 if (printedLabel) {
                     pw.println("");