Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 8734438320

Change-Id: I8618393edf8c2c41663dfb457588ac4f9511239c
This commit is contained in:
Thecrazyskull
2017-01-29 17:35:23 +00:00
committed by android-build-merger
parent c2410cb9e5 8734438320
commit 071db34e78
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/KeySetManagerService.java
View File

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