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

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

Browse Source 
Change-Id: I11bdf425bbcf6e627ef2d42d713a8d47c55aef10
This commit is contained in:
TreeHugger Robot
2020-04-21 09:56:05 +00:00
committed by Automerger Merge Worker
parent 83183d5f48 79c9bdb2d0
commit 9e18c88925
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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