commit | 071db34e78d166a6057cd8bec2b4c5508e3ec5f2 | [log] [tgz] |
---|---|---|
author | Thecrazyskull <anaskarbila@gmail.com> | Sun Jan 29 17:35:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Jan 29 17:35:23 2017 +0000 |
tree | eb3dd55b30c02cf1c6f08658c2899b3584042e93 | |
parent | c2410cb9e576b420d96de627f2ed1043a4d7f93f [diff] | |
parent | 873443832051bfce7d5f5a04e883d1b65d547472 [diff] |
Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2 am: 7adb348796 am: 8734438320 Change-Id: I8618393edf8c2c41663dfb457588ac4f9511239c
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()); }