commit 7adb3487967a0dbee54fe74f450a364fbbc6a17f
author Thecrazyskull <anaskarbila@gmail.com> Sun Jan 29 17:26:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Jan 29 17:26:47 2017 +0000
tree c4dbcd0642d2d4f49d3c7b9e8d52acb377acfd28
parent a377b026f65eb49f3724a785b52061b688905580
parent 51ad0f67d27be05d44304efe58a58590c3d11671

Merge "KeySetManagerService: prevent NPE" am: c66327149a
am: 51ad0f67d2

Change-Id: I72d62e1d1f3d2b6db616762e724c1608a1e487c8

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 0de0c92..49d3c8b 100644
--- a/services/core/java/com/android/server/pm/KeySetManagerService.java
+++ b/services/core/java/com/android/server/pm/KeySetManagerService.java
@@ -287,7 +287,7 @@
         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());
             }