From 9cc099ab7eafa0c59467c33fa6ab743498461bcc Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 1 Apr 2020 19:57:46 -0700
Subject: [PATCH] Add null check for config when clicking on wifi picker entry

Null check is needed when getting wifi configuration instead of relying
on isSaved() since isSaved() may be true while getWifiConfiguration() is
null.

Bug: 153029289
Test: manual tapping on suggested entry and verifying no crash
Change-Id: Id487f48bd2079d596ea157920e4709fb8407ee9f
---
 src/com/android/settings/wifi/WifiSettings2.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index f73891dfb53..1098c013cdc 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -538,7 +538,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment
             final WifiEntry selectedEntry =
                     ((LongPressWifiEntryPreference) preference).getWifiEntry();
 
-            if (selectedEntry.isSaved()) {
+            if (selectedEntry.getWifiConfiguration() != null) {
                 if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
                         .hasEverConnected()) {
                     launchConfigNewNetworkFragment(selectedEntry);