PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Browse Source 
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
This commit is contained in:
Victor Chang
2016-05-17 16:50:08 +01:00
parent cba033e4b5
commit 00859bd548
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -695,16 +695,18 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
UserHandle profile = profiles.get(i); UserHandle profile = profiles.get(i);
int profileId = profile.getIdentifier(); int profileId = profile.getIdentifier();
if (shouldSkipProfile(profile)) {
certHoldersByProfile.put(profileId, new ArrayList<CertHolder>(0));
continue;
}
List<ParcelableString> aliases = aliasesByProfileId.get(profileId); List<ParcelableString> aliases = aliasesByProfileId.get(profileId);
if (isCancelled()) { if (isCancelled()) {
return new SparseArray<List<CertHolder>>(); return new SparseArray<List<CertHolder>>();
} }
IKeyChainService service = mKeyChainConnectionByProfileId.get(profileId) KeyChainConnection keyChainConnection = mKeyChainConnectionByProfileId.get(
.getService(); profileId);
if (shouldSkipProfile(profile) || aliases == null
|| keyChainConnection == null) {
certHoldersByProfile.put(profileId, new ArrayList<CertHolder>(0));
continue;
}
IKeyChainService service = keyChainConnection.getService();
List<CertHolder> certHolders = new ArrayList<CertHolder>(max); List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
final int aliasMax = aliases.size(); final int aliasMax = aliases.size();
for (int j = 0; j < aliasMax; ++j) { for (int j = 0; j < aliasMax; ++j) {