Snap for 8564071 from 95b8c7c51738969ef1029906a939d624fd9411d3 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android13-mainline-permission-release

Change-Id: I088e43a28912e7c8f367de92a914a25fbed65ac7

1 files changed, 7 insertions, 4 deletions

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 final class TvWifiManager {
     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);
     }
 }