Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b2259b3a55f462517fa6d8a3e58d07433da19087':
  Fixing Trusted Credentials Settings crash
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-12 23:05:39 +00:00
committed by Android Git Automerger
parent 88ff5747b6 b2259b3a55
commit 2349624368
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 @Override
public int getChildrenCount(int groupPosition) { 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 @Override
public UserHandle getGroup(int groupPosition) { public UserHandle getGroup(int groupPosition) {
@@ -366,7 +370,11 @@ public class TrustedCredentialsSettings extends Fragment {
mData.new AliasLoader().execute(); mData.new AliasLoader().execute();
} }
@Override public int getCount() { @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) { @Override public CertHolder getItem(int position) {
return mData.mCertHoldersByUserId.valueAt(0).get(position); return mData.mCertHoldersByUserId.valueAt(0).get(position);