From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Wed, 10 Sep 2014 11:22:36 +0000 (+0100)
Subject: Fixing Trusted Credentials Settings crash
X-Git-Tag: android-x86-6.0-r1~671^2~30^2~57^2~46^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=860e1e1f44bd22aed0a6549f8a5244b47b0fa98d;p=android-x86%2Fpackages-apps-Settings.git

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
---

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<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);