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

Merge "Fixing Trusted Credentials Settings crash" into lmp-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-11 09:23:53 +00:00
committed by Android (Google) Code Review
parent f8310c1850 860e1e1f44
commit f572fdd132
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);