diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index ad95b45df90..4efbe02abcf 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -278,7 +278,11 @@ public class TrustedCredentialsSettings extends Fragment { } @Override public int getChildrenCount(int groupPosition) { - return mData.mCertHoldersByUserId.valueAt(groupPosition).size(); + List 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 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);