Merge "Force MAC randomization to enabled on ACTION_WIFI_ADD_NETWORKS" into udc-dev

This commit is contained in:
Etan Cohen
2023-03-23 04:24:41 +00:00
committed by Android (Google) Code Review

View File

@@ -655,6 +655,10 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
try { try {
mWifiManager.addOrUpdatePasspointConfiguration(passpointConfig); mWifiManager.addOrUpdatePasspointConfiguration(passpointConfig);
mAnyNetworkSavedSuccess = true; mAnyNetworkSavedSuccess = true;
// (force) enable MAC randomization on new credentials
mWifiManager.setMacRandomizationSettingPasspointEnabled(
passpointConfig.getHomeSp().getFqdn(), true);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
mResultCodeArrayList.set(mUiToRequestedList.get(index).mIndex, mResultCodeArrayList.set(mUiToRequestedList.get(index).mIndex,
RESULT_NETWORK_ADD_ERROR); RESULT_NETWORK_ADD_ERROR);
@@ -669,6 +673,10 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
final WifiConfiguration wifiConfiguration = final WifiConfiguration wifiConfiguration =
mUiToRequestedList.get(index).mWifiNetworkSuggestion.getWifiConfiguration(); mUiToRequestedList.get(index).mWifiNetworkSuggestion.getWifiConfiguration();
wifiConfiguration.SSID = addQuotationIfNeeded(wifiConfiguration.SSID); wifiConfiguration.SSID = addQuotationIfNeeded(wifiConfiguration.SSID);
// (force) enable MAC randomization on new credentials
wifiConfiguration.setMacRandomizationSetting(
WifiConfiguration.RANDOMIZATION_PERSISTENT);
mWifiManager.save(wifiConfiguration, mSaveListener); mWifiManager.save(wifiConfiguration, mSaveListener);
} }
} }