commit 88b2790d734504389156111002d8c5bd162d9b9c
author Amit Mahajan <amitmahajan@google.com> Fri Oct 10 22:41:08 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 10 22:41:09 2014 +0000
tree 6f6c508f9d417dea66c5978475412b0b8fbcbd86
parent a4204bde454bbac665c7c1302056c9a64f76ffb1
parent 4d49e3f5b1736e2bdef1445c6c57809435ce8e80

Merge "Fix to show signal strength as 0 if out of service." into lmp-dev

src/com/android/settings/HomeSettings.java

diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index cd60091..6da1848 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -48,7 +48,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.RadioButton;
@@ -250,7 +249,7 @@
     }
 
     private boolean versionNumberAtLeastL(int versionNumber) {
-        return versionNumber >= Build.VERSION_CODES.L;
+        return versionNumber >= Build.VERSION_CODES.LOLLIPOP;
     }
 
     @Override

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