Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0

Change-Id: Ic4d3fb41b7df91e66e1d606bf9a0424fb4b8caa9
This commit is contained in:
TreeHugger Robot
2020-04-21 09:56:52 +00:00
committed by Automerger Merge Worker

View File

@@ -544,9 +544,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;
}