LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update connected clients when a downstream disappears.

Browse Source 
Otherwise, if another downstream of the same type reappears, the
code would fire a callback with the previous list of clients.

Bug: 150644681
Test: atest TetheringIntegrationTests:EthernetTetheringTest --rerun-until-failure 100
Change-Id: I6b34ea747ae1831001077f44879bb6828dcecc96
This commit is contained in:
Lorenzo Colitti
2020-03-24 18:13:46 +09:00
parent d44de5a624
commit ca071b79cd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Tethering/src/com/android/server/connectivity/tethering/Tethering.java
View File

@@ -430,9 +430,7 @@ public class Tethering {
// Called by wifi when the number of soft AP clients changed. // Called by wifi when the number of soft AP clients changed.
@Override @Override
public void onConnectedClientsChanged(final List<WifiClient> clients) { public void onConnectedClientsChanged(final List<WifiClient> clients) {
if (mConnectedClientsTracker.updateConnectedClients(mForwardedDownstreams, clients)) { updateConnectedClients(clients);
reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
}
} }
} }
@@ -1558,6 +1556,7 @@ public class Tethering {
mIPv6TetheringCoordinator.removeActiveDownstream(who); mIPv6TetheringCoordinator.removeActiveDownstream(who);
mOffload.excludeDownstreamInterface(who.interfaceName()); mOffload.excludeDownstreamInterface(who.interfaceName());
mForwardedDownstreams.remove(who); mForwardedDownstreams.remove(who);
updateConnectedClients(null /* wifiClients */);
// If this is a Wi-Fi interface, tell WifiManager of any errors // If this is a Wi-Fi interface, tell WifiManager of any errors
// or the inactive serving state. // or the inactive serving state.
@@ -2140,6 +2139,12 @@ public class Tethering {
return false; return false;
} }
private void updateConnectedClients(final List<WifiClient> wifiClients) {
if (mConnectedClientsTracker.updateConnectedClients(mForwardedDownstreams, wifiClients)) {
reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
}
}
private IpServer.Callback makeControlCallback() { private IpServer.Callback makeControlCallback() {
return new IpServer.Callback() { return new IpServer.Callback() {
@Override @Override
@@ -2154,10 +2159,7 @@ public class Tethering {
@Override @Override
public void dhcpLeasesChanged() { public void dhcpLeasesChanged() {
if (mConnectedClientsTracker.updateConnectedClients( updateConnectedClients(null /* wifiClients */);
mForwardedDownstreams, null /* wifiClients */)) {
reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
}
} }
}; };
} }