Snap for 8730993 from d04e6bd6926e8f98370ac631e44c10e7b47502c9 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Ie4aa5bc0cce26a0ae54aa3933bcbbf05f3ee1bf8

1 files changed, 4 insertions, 7 deletions

diff --git a/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java b/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
index ad75ce5..38de449 100644
--- a/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
+++ b/java/com/android/libraries/tv/tvsystem/wifi/TvWifiManager.java
@@ -64,15 +64,12 @@ public final class TvWifiManager {
     public void startLocalOnlyHotspot(@NonNull SoftApConfiguration config,
             @Nullable Executor executor,
             @Nullable WifiManager.LocalOnlyHotspotCallback callback) {
-      android.net.wifi.SoftApConfiguration.Builder frameworkConfig =
+        android.net.wifi.SoftApConfiguration frameworkConfig =
             new android.net.wifi.SoftApConfiguration.Builder()
                 .setBssid(config.getBssid())
                 .setSsid(config.getSsid())
-                .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);
+                .setPassphrase(config.getWpa2Passphrase(), SECURITY_TYPE_WPA2_PSK)
+                .build();
+        mWifiManager.startLocalOnlyHotspot(frameworkConfig, executor, callback);
     }
 }