From 205b585cf3652d3bde5a20c3eb67d64ea0a85268 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Tue, 21 Apr 2020 12:10:30 +0800 Subject: [PATCH] [Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks When users click a Wi-Fi network and it's WifiConfiguration.getNetworkSelectionStatus().hasEverConnected() is false, WifiSettings2 will launch the Wi-Fi edit UI for users to edit password again. It's not necessary to show the Wi-Fi edit UI if the Wi-Fi network is a open network. Bug: 154548505 Test: manual Click a never connected secure Wi-Fi and edit UI shows. Click a never connected open Wi-Fi and edit UI does not show. Change-Id: Ie8489aff001942f92fbfaafd772f84b1b4a09cf4 --- src/com/android/settings/wifi/WifiSettings2.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 30d5ad08da4..d26e8c349c0 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -539,9 +539,11 @@ public class WifiSettings2 extends RestrictedSettingsFragment final WifiEntry selectedEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry(); - if (selectedEntry.getWifiConfiguration() != null) { - if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus() - .hasEverConnected()) { + // If the clicked WiFi entry is never connected, launch Wi-Fi edit UI to edit password. + if (selectedEntry.getSecurity() != WifiEntry.SECURITY_NONE + && selectedEntry.getSecurity() != WifiEntry.SECURITY_OWE) { + final WifiConfiguration config = selectedEntry.getWifiConfiguration(); + if (config != null && !config.getNetworkSelectionStatus().hasEverConnected()) { launchConfigNewNetworkFragment(selectedEntry); return true; }