commit e954fe26af7a599207ddce0f43d3487dad80bdd9
author Roshan Pius <rpius@google.com> Fri Aug 14 07:16:59 2020 -0700
committer Roshan Pius <rpius@google.com> Wed Dec 23 09:14:50 2020 -0800
tree 39e4f543b6913e8f4e43393d1161736b45b1a2f0
parent b7f896ffdc63b04011d2be37a8b336729dd343cf

ClientModeImpl: Attach WifiInfo in NetworkCapabilities

Bug: 162602799
Test: atest com.android.server.wifi
Change-Id: I255938df90d4f76be26932c18f70933e259faedc
Merged-In: I255938df90d4f76be26932c18f70933e259faedc

service/java/com/android/server/wifi/ClientModeImpl.java

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 8c05f7a..1969023 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -2459,6 +2459,7 @@
              */
             int newSignalLevel = RssiUtil.calculateSignalLevel(mContext, newRssi);
             if (newSignalLevel != mLastSignalLevel) {
+                // TODO (b/162602799): Do we need to change the update frequency?
                 updateCapabilities();
                 sendRssiChangeBroadcast(newRssi);
             }
@@ -4485,6 +4486,12 @@
         if (!mWifiInfo.getSSID().equals(WifiManager.UNKNOWN_SSID)) {
             builder.setSsid(mWifiInfo.getSSID());
         }
+
+        // Only send out WifiInfo in >= Android S devices.
+        if (SdkLevel.isAtLeastS()) {
+            builder.setTransportInfo(new WifiInfo(mWifiInfo));
+        }
+
         Pair<Integer, String> specificRequestUidAndPackageName =
                 mNetworkFactory.getSpecificNetworkRequestUidAndPackageName(
                         currentWifiConfiguration);

tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java

diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index d4af7ec..f72697a 100644
--- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -124,6 +124,7 @@
 import com.android.internal.util.AsyncChannel;
 import com.android.internal.util.IState;
 import com.android.internal.util.StateMachine;
+import com.android.modules.utils.build.SdkLevel;
 import com.android.server.wifi.hotspot2.NetworkDetail;
 import com.android.server.wifi.hotspot2.PasspointManager;
 import com.android.server.wifi.hotspot2.PasspointProvisioningTestUtil;
@@ -1039,6 +1040,16 @@
         assertEquals(sFreq, wifiInfo.getFrequency());
         assertTrue(sWifiSsid.equals(wifiInfo.getWifiSsid()));
         assertNull(wifiInfo.getPasspointProviderFriendlyName());
+        expectRegisterNetworkAgent((na) -> {
+        }, (nc) -> {
+                if (SdkLevel.isAtLeastS()) {
+                    WifiInfo wifiInfoFromTi = (WifiInfo) nc.getTransportInfo();
+                    assertEquals(sBSSID, wifiInfoFromTi.getBSSID());
+                    assertEquals(sFreq, wifiInfoFromTi.getFrequency());
+                    assertTrue(sWifiSsid.equals(wifiInfoFromTi.getWifiSsid()));
+                    assertNull(wifiInfoFromTi.getPasspointProviderFriendlyName());
+                }
+            });
         // Ensure the connection stats for the network is updated.
         verify(mWifiConfigManager).updateNetworkAfterConnect(FRAMEWORK_NETWORK_ID);
         verify(mWifiConfigManager).updateRandomizedMacExpireTime(any(), anyLong());
@@ -2424,7 +2435,6 @@
 
         WifiInfo connectionInfo = mCmi.syncRequestConnectionInfo();
 
-        assertNotEquals(wifiInfo, connectionInfo);
         assertEquals(wifiInfo.getSSID(), connectionInfo.getSSID());
         assertEquals(wifiInfo.getBSSID(), connectionInfo.getBSSID());
         assertEquals(wifiInfo.getMacAddress(), connectionInfo.getMacAddress());