From 50afc70f8f3fe49471aef3d8f7277e1c76fcf111 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Thu, 9 Jan 2020 18:36:33 +0800
Subject: [PATCH] [Wi-Fi] Edit a never connected WifiEntryPreference in
 WifiSettings2

If the Wi-Fi network is never connected after it's saved,
edit it instead of connecting when users click the WifiEntryPreference.

Bug: 143328194
Test: manual
      Click a saved wrong password Wi-Fi network

Change-Id: If974ce9225fe6b6ed5f8a3c6c0ff619532acc1c2
---
 src/com/android/settings/wifi/WifiSettings2.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index a1f1ad988cc..5bedb705156 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -564,6 +564,15 @@ public class WifiSettings2 extends RestrictedSettingsFragment
         if (preference instanceof LongPressWifiEntryPreference) {
             final WifiEntry selectedEntry =
                     ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+            if (selectedEntry.isSaved()) {
+                if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
+                        .getHasEverConnected()) {
+                    launchConfigNewNetworkFragment(selectedEntry);
+                    return true;
+                }
+            }
+
             connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
         } else if (preference == mAddWifiNetworkPreference) {
             onAddNetworkPressed();