From 50263efbaf5ce432c7335c1428ca10c1096cce1f Mon Sep 17 00:00:00 2001
From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Thu, 9 Oct 2014 13:00:32 +0100
Subject: [PATCH] Remove CA Cert UI item from one list only

When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.

Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
---
 src/com/android/settings/TrustedCredentialsSettings.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 5ec513fbdfd..14c4936e9ec 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -488,9 +488,11 @@ public class TrustedCredentialsSettings extends Fragment {
         }
 
         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);
+                }
             }
         }
     }