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

Merge "[Mac Randomization] Fix perference changing not work and wrong default value"

Browse Source
This commit is contained in:
Cosmo Hsieh
2019-01-17 00:47:00 +00:00
committed by Android (Google) Code Review
parent 569b6a41ef 82588849ac
commit d4e5f0b89e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,6 +251,8 @@ public class WifiConfigController implements TextWatcher,
com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) { com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) {
View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields); View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields);
privacySettingsLayout.setVisibility(View.VISIBLE); privacySettingsLayout.setVisibility(View.VISIBLE);
// Set default value
mPrivacySettingsSpinner.setSelection(WifiConfiguration.RANDOMIZATION_PERSISTENT);
} }
mHiddenSettingsSpinner.setOnItemSelectedListener(this); mHiddenSettingsSpinner.setOnItemSelectedListener(this);
mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning); mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);

3
src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
View File

@@ -69,6 +69,9 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
if (mWifiConfiguration != null) { if (mWifiConfiguration != null) {
mWifiConfiguration.macRandomizationSetting = Integer.parseInt((String) newValue); mWifiConfiguration.macRandomizationSetting = Integer.parseInt((String) newValue);
mWifiManager.updateNetwork(mWifiConfiguration); mWifiManager.updateNetwork(mWifiConfiguration);
// To activate changing, we need reconnect network. WiFi will auto connect to current
// network after disconnect().
mWifiManager.disconnect();
} }
updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue)); updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue));
return true; return true;