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

Merge "softap: Use set/getPassphrase to replace set/getWpa2Passphrase"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-10 08:47:44 +00:00
committed by Android (Google) Code Review
parent 7a3ed0ecea 24a505c4eb
commit c824ef4940
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,7 +349,7 @@ public class WifiDppUtils {
// When the value of this key is read, the actual key is not returned, just a "*".
// Call privileged system API to obtain actual key.
final String preSharedKey = removeFirstAndLastDoubleQuotes(
softApConfiguration.getWpa2Passphrase());
softApConfiguration.getPassphrase());
if (!TextUtils.isEmpty(ssid)) {
intent.putExtra(EXTRA_WIFI_SSID, ssid);

4
src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
View File

@@ -51,10 +51,10 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
if (config == null
|| (config.getSecurityType() == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
&& TextUtils.isEmpty(config.getWpa2Passphrase()))) {
&& TextUtils.isEmpty(config.getPassphrase()))) {
mPassword = generateRandomPassword();
} else {
mPassword = config.getWpa2Passphrase();
mPassword = config.getPassphrase();
}
((ValidatedEditTextPreference) mPreference).setValidator(this);
((ValidatedEditTextPreference) mPreference).setIsPassword(true);

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

@@ -214,8 +214,9 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
final int securityType = mSecurityPreferenceController.getSecurityType();
configBuilder.setSsid(mSSIDPreferenceController.getSSID());
if (securityType == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK) {
configBuilder.setWpa2Passphrase(
mPasswordPreferenceController.getPasswordValidated(securityType));
configBuilder.setPassphrase(
mPasswordPreferenceController.getPasswordValidated(securityType),
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
}
configBuilder.setBand(mApBandPreferenceController.getBandIndex());
return configBuilder.build();