From 860e1e1f44bd22aed0a6549f8a5244b47b0fa98d Mon Sep 17 00:00:00 2001 From: Zoltan Szatmary-Ban Date: Wed, 10 Sep 2014 12:22:36 +0100 Subject: [PATCH] Fixing Trusted Credentials Settings crash List adapter's getCount method did not check for the case of uninitialised data. This CL fixes that. Bug:17437943 Change-Id: I72d7f2c92aa380b1aaafe0658bd920017ff23906 --- src/com/android/settings/TrustedCredentialsSettings.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index ad95b45df9..4efbe02abc 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); -- 2.11.0