From f70b854aaf4d7c7a3aa533f6ce0444b37559f5d1 Mon Sep 17 00:00:00 2001
From: lesl <lesl@google.com>
Date: Thu, 9 Jan 2020 01:02:09 +0800
Subject: [PATCH] softap: Update LOHS API usage

Use SoftApConfiguration to replace WifiConfiguration

Bug: 138801922
Bug: 142752869
Test: atest
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSingleRequestByApps
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotWithConfig

Change-Id: I918da2b77f6284fba24edae53f6a4ca6c4072cda
---
 .../android/net/wifi/cts/WifiManagerTest.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index a05679e0af..b5590f86b2 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -478,11 +478,11 @@ public class WifiManagerTest extends AndroidTestCase {
             }
             // check if we got the callback
             assertTrue(callback.onStartedCalled);
-            assertNotNull(callback.reservation.getWifiConfiguration());
+            assertNotNull(callback.reservation.getSoftApConfiguration());
             if (!hasAutomotiveFeature()) {
                 assertEquals(
-                        WifiConfiguration.AP_BAND_2GHZ,
-                        callback.reservation.getWifiConfiguration().apBand);
+                        SoftApConfiguration.BAND_2GHZ,
+                        callback.reservation.getSoftApConfiguration().getBand());
             }
             assertFalse(callback.onFailedCalled);
             assertFalse(callback.onStoppedCalled);
@@ -657,11 +657,11 @@ public class WifiManagerTest extends AndroidTestCase {
             assertTrue(callback.onStartedCalled);
 
             assertNotNull(callback.reservation);
-            WifiConfiguration wifiConfig = callback.reservation.getWifiConfiguration();
-            assertNotNull(wifiConfig);
-            assertEquals(TEST_MAC, MacAddress.fromString(wifiConfig.BSSID));
-            assertEquals(TEST_SSID_UNQUOTED, wifiConfig.SSID);
-            assertEquals(TEST_PASSPHRASE, wifiConfig.preSharedKey);
+            SoftApConfiguration softApConfig = callback.reservation.getSoftApConfiguration();
+            assertNotNull(softApConfig);
+            assertEquals(TEST_MAC, softApConfig.getBssid());
+            assertEquals(TEST_SSID_UNQUOTED, softApConfig.getSsid());
+            assertEquals(TEST_PASSPHRASE, softApConfig.getPassphrase());
 
             // clean up
             stopLocalOnlyHotspot(callback, wifiEnabled);