Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87344383 authored by Thecrazyskull's avatar Thecrazyskull Committed by android-build-merger
Browse files

Merge "KeySetManagerService: prevent NPE" am: c6632714 am: 51ad0f67 

am: 7adb3487

Change-Id: Icc4d2d025c03cc71557e359bf8f4f230d38ef595
parents 1a05097d 7adb3487

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

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class KeySetManagerService { 
        for (int i = 0; i < defMapSize; i++) {

            String alias = definedMapping.keyAt(i);

            ArraySet<PublicKey> pubKeys = definedMapping.valueAt(i);

            if (alias != null && pubKeys != null || pubKeys.size() > 0) {

            if (alias != null && pubKeys != null && pubKeys.size() > 0) {

                KeySetHandle ks = addKeySetLPw(pubKeys);

                newKeySetAliases.put(alias, ks.getId());

            }