Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860e1e1f authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban
Browse files

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
parent 72e5583d

src/com/android/settings/TrustedCredentialsSettings.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -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);