diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-09-10 12:22:36 +0100 |
---|---|---|
committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-09-10 12:22:36 +0100 |
commit | 860e1e1f44bd22aed0a6549f8a5244b47b0fa98d (patch) | |
tree | 8f3b2bdeabc763c7c2d1a65ca20f1b6bb7de563d /src/com/android/settings/TrustedCredentialsSettings.java | |
parent | 72e5583d2a9af10f2750e9abd23c3d5400e3c789 (diff) | |
download | packages_apps_Settings-860e1e1f44bd22aed0a6549f8a5244b47b0fa98d.zip packages_apps_Settings-860e1e1f44bd22aed0a6549f8a5244b47b0fa98d.tar.gz packages_apps_Settings-860e1e1f44bd22aed0a6549f8a5244b47b0fa98d.tar.bz2 |
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
Diffstat (limited to 'src/com/android/settings/TrustedCredentialsSettings.java')
-rw-r--r-- | src/com/android/settings/TrustedCredentialsSettings.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index ad95b45..4efbe02 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<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); |