Merge "Implemen WiFi MAC randomization api for WiFi MAC randomization preference."

This commit is contained in:
Cosmo Hsieh
2018-11-08 06:45:47 +00:00
committed by Android (Google) Code Review

View File

@@ -67,7 +67,7 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (mWifiConfiguration != null) { if (mWifiConfiguration != null) {
//TODO(b/117957974): update MAC randomization level to WifiManager mWifiConfiguration.macRandomizationSetting = Integer.parseInt((String) newValue);
mWifiManager.updateNetwork(mWifiConfiguration); mWifiManager.updateNetwork(mWifiConfiguration);
} }
updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue)); updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue));
@@ -77,10 +77,9 @@ public class WifiPrivacyPreferenceController extends BasePreferenceController im
@VisibleForTesting @VisibleForTesting
int getRandomizationValue() { int getRandomizationValue() {
if (mWifiConfiguration != null) { if (mWifiConfiguration != null) {
//TODO(b/117957974): get real MAC randomization level from WifiManager return mWifiConfiguration.macRandomizationSetting;
return 0;
} }
return 0; return WifiConfiguration.RANDOMIZATION_PERSISTENT;
} }
private void updateSummary(DropDownPreference preference, int macRandomized) { private void updateSummary(DropDownPreference preference, int macRandomized) {