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

Fixing Trusted Credentials Settings crash

Browse Source 
List adapter's getCount method did not check for the case of uninitialised
data. This CL fixes that.

Bug:17437943
Change-Id: I72d7f2c92aa380b1aaafe0658bd920017ff23906
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-10 12:22:36 +01:00
parent 72e5583d2a
commit 860e1e1f44
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,11 @@ public class TrustedCredentialsSettings extends Fragment {
}
@Override
public int getChildrenCount(int groupPosition) {
return mData.mCertHoldersByUserId.valueAt(groupPosition).size();
List<CertHolder> certHolders = mData.mCertHoldersByUserId.valueAt(groupPosition);
if (certHolders != null) {
return certHolders.size();
}
return 0;
}
@Override
public UserHandle getGroup(int groupPosition) {
@@ -366,7 +370,11 @@ public class TrustedCredentialsSettings extends Fragment {
mData.new AliasLoader().execute();
}
@Override public int getCount() {
return mData.mCertHoldersByUserId.valueAt(0).size();
List<CertHolder> certHolders = mData.mCertHoldersByUserId.valueAt(0);
if (certHolders != null) {
return certHolders.size();
}
return 0;
}
@Override public CertHolder getItem(int position) {
return mData.mCertHoldersByUserId.valueAt(0).get(position);