commit 7ca92b7b5bd24c61ca788b9929e9b73fbc19d5f4
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 09 05:44:09 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 09 05:44:09 2017 +0000
tree aaf2ff920a639ce5e6e19f8f2f3049d4792162a6
parent bfc1cee888850b9f55cf42ffacb17a217381da9c
parent 01f46a3642c8f7e8788bfb69671996566e8464b4

Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: I61388ab9620f684377d5eb06df4ccf591553f9b6

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 6935749..ecd4b59 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -1030,7 +1030,7 @@
                 setUserCertInvisible();
                 setPasswordInvisible();
                 setIdentityInvisible();
-                if (mAccessPoint.isCarrierAp()) {
+                if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
                     setEapMethodInvisible();
                 }
                 break;