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

Merge "Remove WifiEntry transitional security types"

Browse Source
This commit is contained in:
Quang Luong
2020-01-23 19:49:43 +00:00
committed by Android (Google) Code Review
parent 150a7f0ac1 73c168162b
commit f21a9b0b11
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -276,7 +276,7 @@ public class WifiConfigController2 implements TextWatcher,
mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK
? View.GONE ? View.GONE
: View.VISIBLE); : View.VISIBLE);
mSecurityInPosition = new Integer[WifiEntry.SECURITY_MAX_VAL]; mSecurityInPosition = new Integer[WifiEntry.NUM_SECURITY_TYPES];
if (mWifiEntry == null) { // new network if (mWifiEntry == null) { // new network
configureSecuritySpinner(); configureSecuritySpinner();

5
src/com/android/settings/wifi/dpp/WifiDppUtils.java
View File

@@ -252,11 +252,6 @@ public class WifiDppUtils {
final WifiConfiguration wifiConfiguration = wifiEntry.getWifiConfiguration(); final WifiConfiguration wifiConfiguration = wifiEntry.getWifiConfiguration();
setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration); setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
// For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices
if (wifiEntry.getSecurity() == WifiEntry.SECURITY_PSK_SAE_TRANSITION) {
intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);
}
return intent; return intent;
} }