commit 6c12f06bf896ce0ab6e91af27ac14263533e43fc
author Ningyuan Wang <nywang@google.com> Fri Nov 03 11:16:56 2017 -0700
committer Ningyuan Wang <nywang@google.com> Wed Nov 08 18:24:48 2017 +0000
tree 90671cb5d8268009b93615b2dec0d926821b0ff5
parent 7b75c5a3385dd01dc9302431a8e82db94494d2bd

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)

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;