Merge "Fix crash in KeySet dump" into lmp-dev (b541f09b) · Commits · e / os / android_frameworks_base

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -538,7 +538,9 @@ public class KeySetManagerService {
		pw.println("");
		}
		printedLabel = false;
		for (long keySetId : pkg.keySetData.getSigningKeySets()) {
		final long[] signingKeySets = pkg.keySetData.getSigningKeySets();
		if (signingKeySets != null) {
		for (long keySetId : signingKeySets) {
		if (!printedLabel) {
		pw.print(" Signing KeySets: ");
		printedLabel = true;
		@@ -547,6 +549,7 @@ public class KeySetManagerService {
		}
		pw.print(Long.toString(keySetId));
		}
		}
		if (printedLabel) {
		pw.println("");
		}