diff options
author | Christopher Tate <ctate@google.com> | 2014-09-03 16:11:31 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2014-09-03 16:11:31 -0700 |
commit | 6441bc7e5366610771b587a8cb6ff04c2861b7a5 (patch) | |
tree | a883e45a9b177111de9f00841cc7474b7ff7b280 /services/core/java/com/android/server/pm/KeySetManagerService.java | |
parent | e8f8bc0ad6f7f2c657b4360033d2c7571c800ccb (diff) | |
download | frameworks_base-6441bc7e5366610771b587a8cb6ff04c2861b7a5.zip frameworks_base-6441bc7e5366610771b587a8cb6ff04c2861b7a5.tar.gz frameworks_base-6441bc7e5366610771b587a8cb6ff04c2861b7a5.tar.bz2 |
Fix crash in KeySet dump
This was unfortunately DOSing some important parts of the Package
Manager's dumpsys output.
Change-Id: I228f23e8e26820b40a8d8772cd5f5b04ee8317d9
Diffstat (limited to 'services/core/java/com/android/server/pm/KeySetManagerService.java')
-rw-r--r-- | services/core/java/com/android/server/pm/KeySetManagerService.java | 17 |
1 files changed, 10 insertions, 7 deletions
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 @@ public class KeySetManagerService { 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(""); |