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

am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev

Browse Source 
* commit 'b46eeeb7be7dbf7b791c0527e096771032112321':
  Fixing Trusted Credentials Settings crash
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-12 13:59:11 +00:00
committed by Android Git Automerger
parent a2bba88bc8 b46eeeb7be
commit b2259b3a55
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);