commit | 7664bceec3422f55db46d7d1bf908ae6110a6548 | [log] [tgz] |
---|---|---|
author | Thecrazyskull <anaskarbila@gmail.com> | Thu Jan 26 08:59:51 2017 -0600 |
committer | Thecrazyskull <anaskarbila@gmail.com> | Thu Jan 26 09:03:59 2017 -0600 |
tree | 55dc35963e4ec60dba0e95f4d7b0a6db53b48e2a | |
parent | 2c1e396382296e89d120a5356dbb16b48cf671cd [diff] |
KeySetManagerService: prevent NPE * If pubKeys is null, we cannot check the size of pubKeys Test: none Change-Id: I3b4074d8727b084fea98a0e0a5a0afbd96bea41d
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()); }