From 01f46a3642c8f7e8788bfb69671996566e8464b4 Mon Sep 17 00:00:00 2001
From: Ningyuan Wang <nywang@google.com>
Date: Fri, 3 Nov 2017 11:16:56 -0700
Subject: [PATCH] Enforce null check for mAccessPoint

mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f44758a64b7af6d2d11e17d10ef125ce)
(cherry picked from commit 6c12f06bf896ce0ab6e91af27ac14263533e43fc)
---
 src/com/android/settings/wifi/WifiConfigController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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