commit 51ad0f67d27be05d44304efe58a58590c3d11671
author Thecrazyskull <anaskarbila@gmail.com> Sun Jan 29 17:22:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Jan 29 17:22:13 2017 +0000
tree 8456c0fd83c40ed6c18737b1cf7a9e759df66b33
parent fc5430a39ca0773e959139b774c9f7e91ab2edd5
parent c66327149a8b6666fdfee02a2f0feb48ef7086e3

Merge "KeySetManagerService: prevent NPE"
am: c66327149a

Change-Id: I09d6fb3e2644ab9330b10bd67c44e61a204e589b

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());
             }