commit 90625329608c19c3a0b8f7c98bb8710fe346a220
author Zoltan Szatmary-Ban <szatmz@google.com> Thu Oct 09 19:22:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 19:22:48 2014 +0000
tree 46b7bc4e5add16257de87258231a20c7ea1e1329
parent 396748110b8e7e761ee1d82827cc4396ecc5ee66
parent 95dda800a988c1ca778dae08563b6875c30d089a

am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit '95dda800a988c1ca778dae08563b6875c30d089a':
  Remove CA Cert UI item from one list only

src/com/android/settings/TrustedCredentialsSettings.java

diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 5ec513f..14c4936 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -488,9 +488,11 @@
         }
 
         public void remove(CertHolder certHolder) {
-            final int n = mCertHoldersByUserId.size();
-            for (int i = 0; i < n; ++i) {
-                mCertHoldersByUserId.valueAt(i).remove(certHolder);
+            if (mCertHoldersByUserId != null) {
+                final List<CertHolder> certs = mCertHoldersByUserId.get(certHolder.mProfileId);
+                if (certs != null) {
+                    certs.remove(certHolder);
+                }
             }
         }
     }