Merge "Enforce null check for mAccessPoint"

2017-11-06 17:42:39 +00:00
parent c8b6833e13 0117b995f4
commit c90b0196eb
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -1028,7 +1028,7 @@ public class WifiConfigController implements TextWatcher,
                setUserCertInvisible();
                setPasswordInvisible();
                setIdentityInvisible();
-                if (mAccessPoint.isCarrierAp()) {
+                if (mAccessPoint != null && mAccessPoint.isCarrierAp()) {
                    setEapMethodInvisible();
                }
                break;