Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christopher Tate
2014-09-03 23:33:04 +00:00
committed by Android (Google) Code Review
parent 8c07e8d2a3 6441bc7e53
commit b541f09be3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/pm/KeySetManagerService.java
View File

@@ -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("");