Update network capabilities when frequency is changed
When the BSS operating channel frequency changes due to
the channel switch announcement from the AP, the signal poll command
returns the new frequency. Detect the frequency change from
signal poll result & update the network capabilities.
Bug: 253578242
Test: atest com.android.server.wifi.ClientModeImplTest#verifyConnectedModeNetworkCapabilitiesBandwidthUpdate
Test: Manula test - Triggered CSA from AP & confirmed from logs that
network capability is updated.
Change-Id: Id84f4574435fa9fc9f9b653e2f8f8743bb1ec22c
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index dcccf4d..75dbc3c 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -2552,6 +2552,7 @@
int newTxLinkSpeed = pollResult.txBitrateMbps;
int newFrequency = pollResult.associationFrequencyMHz;
int newRxLinkSpeed = pollResult.rxBitrateMbps;
+ boolean updateNetworkCapabilities = false;
if (mVerboseLoggingEnabled) {
logd("updateLinkLayerStatsRssiSpeedFrequencyCapabilities rssi=" + newRssi
@@ -2573,6 +2574,9 @@
mWifiInfo.setRxLinkSpeedMbps(newRxLinkSpeed);
}
if (newFrequency > 0) {
+ if (mWifiInfo.getFrequency() != newFrequency) {
+ updateNetworkCapabilities = true;
+ }
mWifiInfo.setFrequency(newFrequency);
}
// updateLinkBandwidth() requires the latest frequency information
@@ -2589,7 +2593,7 @@
}
mWifiInfo.setRssi(newRssi);
/*
- * Rather then sending the raw RSSI out every time it
+ * Rather than sending the raw RSSI out every time it
* changes, we precalculate the signal level that would
* be displayed in the status bar, and only send the
* broadcast if that much more coarse-grained number
@@ -2600,10 +2604,10 @@
*/
int newSignalLevel = RssiUtil.calculateSignalLevel(mContext, newRssi);
if (newSignalLevel != mLastSignalLevel) {
- // TODO (b/162602799): Do we need to change the update frequency?
sendRssiChangeBroadcast(newRssi);
+ updateNetworkCapabilities = true;
}
- updateLinkBandwidthAndCapabilities(stats, newSignalLevel != mLastSignalLevel, txBytes,
+ updateLinkBandwidthAndCapabilities(stats, updateNetworkCapabilities, txBytes,
rxBytes);
mLastSignalLevel = newSignalLevel;
} else {
@@ -2619,10 +2623,10 @@
return stats;
}
- // Update the link bandwidth. If the link bandwidth changes by a large amount or signal level
- // changes, also update network capabilities.
+ // Update the link bandwidth. Also update network capabilities if the link bandwidth changes
+ // by a large amount or there is a change in signal level or frequency.
private void updateLinkBandwidthAndCapabilities(WifiLinkLayerStats stats,
- boolean hasSignalLevelChanged, long txBytes, long rxBytes) {
+ boolean updateNetworkCapabilities, long txBytes, long rxBytes) {
WifiScoreCard.PerNetwork network = mWifiScoreCard.lookupNetwork(mWifiInfo.getSSID());
network.updateLinkBandwidth(mLastLinkLayerStats, stats, mWifiInfo, txBytes, rxBytes);
int newTxKbps = network.getTxLinkBandwidthKbps();
@@ -2633,7 +2637,7 @@
R.integer.config_wifiLinkBandwidthUpdateThresholdPercent);
if ((txDeltaKbps * 100 > bwUpdateThresholdPercent * mLastTxKbps)
|| (rxDeltaKbps * 100 > bwUpdateThresholdPercent * mLastRxKbps)
- || hasSignalLevelChanged) {
+ || updateNetworkCapabilities) {
mLastTxKbps = newTxKbps;
mLastRxKbps = newRxKbps;
updateCapabilities();
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 555848a..ff35863 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -3419,6 +3419,7 @@
.thenReturn(Collections.emptySet());
when(mWifiNetworkFactory.getSpecificNetworkRequestUidAndPackageName(any(), any()))
.thenReturn(Pair.create(Process.INVALID_UID, ""));
+ mCmi.enableRssiPolling(true);
// Simulate the first connection.
connectWithValidInitRssi(-42);
@@ -3445,7 +3446,7 @@
when(mClock.getWallClockMillis()).thenReturn(startMillis + 0);
when(mPerNetwork.getTxLinkBandwidthKbps()).thenReturn(82_000);
when(mPerNetwork.getRxLinkBandwidthKbps()).thenReturn(92_000);
- mCmi.enableRssiPolling(true);
+ mCmi.sendMessage(ClientModeImpl.CMD_RSSI_POLL, 1);
mLooper.dispatchAll();
when(mClock.getWallClockMillis()).thenReturn(startMillis + 3333);
mLooper.dispatchAll();
@@ -3457,12 +3458,24 @@
assertEquals(82_000, networkCapabilities.getLinkUpstreamBandwidthKbps());
assertEquals(92_000, networkCapabilities.getLinkDownstreamBandwidthKbps());
+ // NetworkCapabilities should be updated when the connected channel frequency is changed
+ // For example due to AP channel switch announcement(CSA).
+ WifiNl80211Manager.SignalPollResult signalPollResult1 =
+ new WifiNl80211Manager.SignalPollResult(-42, 65, 54, sFreq1);
+ when(mWifiNative.signalPoll(any())).thenReturn(signalPollResult1);
+ mCmi.sendMessage(ClientModeImpl.CMD_RSSI_POLL, 1);
+ mLooper.dispatchAll();
+
+ verify(mCmi.mNetworkAgent, times(4))
+ .sendNetworkCapabilitiesAndCache(networkCapabilitiesCaptor.capture());
+ assertEquals(sFreq1, mWifiInfo.getFrequency());
+
// No update after a small change of bandwidth
when(mPerNetwork.getTxLinkBandwidthKbps()).thenReturn(72_000);
when(mPerNetwork.getRxLinkBandwidthKbps()).thenReturn(82_000);
when(mClock.getWallClockMillis()).thenReturn(startMillis + 3333);
mLooper.dispatchAll();
- verify(mCmi.mNetworkAgent, times(3))
+ verify(mCmi.mNetworkAgent, times(4))
.sendNetworkCapabilitiesAndCache(networkCapabilitiesCaptor.capture());
networkCapabilities = networkCapabilitiesCaptor.getValue();
assertEquals(82_000, networkCapabilities.getLinkUpstreamBandwidthKbps());
