Snap for 8564071 from 95b8c7c51738969ef1029906a939d624fd9411d3 to mainline-sdkext-releaseaml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010android13-mainline-sdkext-release

Change-Id: I0830d0fdea2c0b0c22077e927f3c146ea49f2dfe

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);
     }
 }