wifi: Set MAC randomization Setting to NONE when configuring BSSID
Change-Id: I0cf3473fd37ca71feba40903d4b0269d7131e761
Test: Pass setup via GHA with this patch
Bug: 215656264
Bug: 217833086
diff --git a/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java b/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
index 38de449..ad75ce5 100644
--- a/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
+++ b/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
@@ -64,12 +64,15 @@
public void startLocalOnlyHotspot(@NonNull SoftApConfiguration config,
@Nullable Executor executor,
@Nullable WifiManager.LocalOnlyHotspotCallback callback) {
- android.net.wifi.SoftApConfiguration frameworkConfig =
+ android.net.wifi.SoftApConfiguration.Builder frameworkConfig =
new android.net.wifi.SoftApConfiguration.Builder()
.setBssid(config.getBssid())
.setSsid(config.getSsid())
- .setPassphrase(config.getWpa2Passphrase(), SECURITY_TYPE_WPA2_PSK)
- .build();
- mWifiManager.startLocalOnlyHotspot(frameworkConfig, executor, callback);
+ .setPassphrase(config.getWpa2Passphrase(), SECURITY_TYPE_WPA2_PSK);
+ if (config.getBssid() != null) {
+ frameworkConfig.setMacRandomizationSetting(
+ android.net.wifi.SoftApConfiguration.RANDOMIZATION_NONE);
+ }
+ mWifiManager.startLocalOnlyHotspot(frameworkConfig.build(), executor, callback);
}
}