Merge changes I7e82ca01,I3ca0f05c into qt-dev

* changes:
  Improve SupplicantStaIfaceHal coverage
  Improve ClientModeImpl unit test coverage

1 files changed, 13 insertions, 2 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 2da2f691b..718c82fdd 100644
--- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -618,6 +618,7 @@ public class ClientModeImplTest {
         assertEquals("DisconnectedState", getCurrentState().getName());
         assertEquals(ClientModeImpl.CONNECT_MODE, mCmi.getOperationalModeForTest());
         assertEquals(WifiManager.WIFI_STATE_ENABLED, mCmi.syncGetWifiState());
+        assertEquals("enabled", mCmi.syncGetWifiStateByName());
 
         // reset the expectations on mContext since we did get an expected broadcast, but we should
         // not on the next transition
@@ -630,6 +631,7 @@ public class ClientModeImplTest {
         assertEquals(ClientModeImpl.DISABLED_MODE, mCmi.getOperationalModeForTest());
         assertEquals("DefaultState", getCurrentState().getName());
         assertEquals(WifiManager.WIFI_STATE_DISABLED, mCmi.syncGetWifiState());
+        assertEquals("disabled", mCmi.syncGetWifiStateByName());
         verify(mContext, never()).sendStickyBroadcastAsUser(
                 (Intent) argThat(new WifiEnablingStateIntentMatcher()), any());
     }
@@ -2102,7 +2104,7 @@ public class ClientModeImplTest {
 
     /**
      * Test that connected SSID and BSSID are exposed to system server.
-     * Also tests that {@link ClientModeImpl#syncRequestConnectionInfo(String)} always
+     * Also tests that {@link ClientModeImpl#syncRequestConnectionInfo()} always
      * returns a copy of WifiInfo.
      */
     @Test
@@ -2317,7 +2319,7 @@ public class ClientModeImplTest {
                 any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
                 anyInt(), any(NetworkMisc.class), anyInt());
 
-        ArrayList<Integer> thresholdsArray = new ArrayList();
+        ArrayList<Integer> thresholdsArray = new ArrayList<>();
         thresholdsArray.add(RSSI_THRESHOLD_MAX);
         thresholdsArray.add(RSSI_THRESHOLD_MIN);
         Bundle thresholds = new Bundle();
@@ -2379,6 +2381,15 @@ public class ClientModeImplTest {
     }
 
     /**
+     * Verify RSSI polling with verbose logging
+     */
+    @Test
+    public void verifyConnectedModeRssiPollingWithVerboseLogging() throws Exception {
+        mCmi.enableVerboseLogging(1);
+        verifyConnectedModeRssiPolling();
+    }
+
+    /**
      * Verify that calls to start and stop filtering multicast packets are passed on to the IpClient
      * instance.
      */