PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e

Browse Source 
Change-Id: I4a63e84c417fd31e87b0b4cae0a957b13e9b79c5
This commit is contained in:
TreeHugger Robot
2020-04-28 14:36:28 +00:00
committed by Automerger Merge Worker
parent dcba11ba82 4eeb99d63e
commit 47b56d7152
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiSettings2.java
View File

@@ -544,14 +544,9 @@ public class WifiSettings2 extends RestrictedSettingsFragment
final WifiEntry selectedEntry = final WifiEntry selectedEntry =
((LongPressWifiEntryPreference) preference).getWifiEntry(); ((LongPressWifiEntryPreference) preference).getWifiEntry();
// If the clicked WiFi entry is never connected, launch Wi-Fi edit UI to edit password. if (selectedEntry.shouldEditBeforeConnect()) {
if (selectedEntry.getSecurity() != WifiEntry.SECURITY_NONE launchConfigNewNetworkFragment(selectedEntry);
&& selectedEntry.getSecurity() != WifiEntry.SECURITY_OWE) { return true;
final WifiConfiguration config = selectedEntry.getWifiConfiguration();
if (config != null && !config.getNetworkSelectionStatus().hasEverConnected()) {
launchConfigNewNetworkFragment(selectedEntry);
return true;
}
} }
connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */); connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);