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

Merge "Fixed unable to enable hotspot with Security None" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-26 05:43:02 +00:00
committed by Android (Google) Code Review
parent 69caf6fbe4 f7d8f0481d
commit 52d2daf3b3
2 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -84,8 +84,10 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
WifiTetherSSIDPreferenceController mSSIDPreferenceController;
@VisibleForTesting
WifiTetherPasswordPreferenceController mPasswordPreferenceController;
private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
@VisibleForTesting
WifiTetherSecurityPreferenceController mSecurityPreferenceController;
@VisibleForTesting
WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
@VisibleForTesting
WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;
@@ -276,15 +278,16 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
SoftApConfiguration buildNewConfig() {
SoftApConfiguration currentConfig = mWifiTetherViewModel.getSoftApConfiguration();
SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder(currentConfig);
int securityType = (mWifiTetherViewModel.isSpeedFeatureAvailable())
? currentConfig.getSecurityType()
: mSecurityPreferenceController.getSecurityType();
configBuilder.setSsid(mSSIDPreferenceController.getSSID());
if (securityType != SoftApConfiguration.SECURITY_TYPE_OPEN) {
configBuilder.setPassphrase(
mPasswordPreferenceController.getPasswordValidated(securityType),
securityType);
}
int securityType =
mWifiTetherViewModel.isSpeedFeatureAvailable()
? currentConfig.getSecurityType()
: mSecurityPreferenceController.getSecurityType();
String passphrase =
securityType == SoftApConfiguration.SECURITY_TYPE_OPEN
? null
: mPasswordPreferenceController.getPasswordValidated(securityType);
configBuilder.setPassphrase(passphrase, securityType);
if (!mWifiTetherViewModel.isSpeedFeatureAvailable()) {
mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);
}