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

Browse Source 
am: 7adb348796

Change-Id: Icc4d2d025c03cc71557e359bf8f4f230d38ef595
This commit is contained in:
Thecrazyskull
2017-01-29 17:30:47 +00:00
committed by android-build-merger
parent 1a05097d04 7adb348796
commit 8734438320
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++) { for (int i = 0; i < defMapSize; i++) {
String alias = definedMapping.keyAt(i); String alias = definedMapping.keyAt(i);
ArraySet<PublicKey> pubKeys = definedMapping.valueAt(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); KeySetHandle ks = addKeySetLPw(pubKeys);
newKeySetAliases.put(alias, ks.getId()); newKeySetAliases.put(alias, ks.getId());
} }