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

Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78

Browse Source 
am: 4e47a17a62

* commit '4e47a17a625e3d275bd6e8d6884aee6564875ed8':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: Ie5fa3d38a976009242964f0c784b2760e7ffef7e
This commit is contained in:
Victor Chang
2016-05-20 17:39:57 +00:00
committed by android-build-merger
parent 7796e8f7cd 4e47a17a62
commit a92877f63c
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) {
UserHandle profile = profiles.get(i);
int profileId = profile.getIdentifier();
if (shouldSkipProfile(profile)) {
certHoldersByProfile.put(profileId, new ArrayList<CertHolder>(0));
continue;
}
List<ParcelableString> aliases = aliasesByProfileId.get(profileId);
if (isCancelled()) {
return new SparseArray<List<CertHolder>>();
}
IKeyChainService service = mKeyChainConnectionByProfileId.get(profileId)
.getService();
KeyChainConnection keyChainConnection = mKeyChainConnectionByProfileId.get(
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);
final int aliasMax = aliases.size();
for (int j = 0; j < aliasMax; ++j) {