commit a4204bde454bbac665c7c1302056c9a64f76ffb1
author Dianne Hackborn <hackbod@google.com> Thu Oct 09 16:54:16 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 09 16:54:16 2014 +0000
tree 1446e0f3a079cb2250533c84bea6d44ab7fc53ee
parent 50263efbaf5ce432c7335c1428ca10c1096cce1f
parent 308c8fdfec893cd3f57e359a381294148aa2d7cb

Merge "Update to use "real" L codename." into lmp-dev

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