Merge "Update connected clients when a downstream disappears." am: 5c1ded75db... (cc0260e6) · Commits · e / os / android_frameworks_base

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -433,9 +433,7 @@ public class Tethering {
		// Called by wifi when the number of soft AP clients changed.
		@Override
		public void onConnectedClientsChanged(final List<WifiClient> clients) {
		if (mConnectedClientsTracker.updateConnectedClients(mForwardedDownstreams, clients)) {
		reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
		}
		updateConnectedClients(clients);
		}
		}

		@@ -1575,6 +1573,7 @@ public class Tethering {
		mIPv6TetheringCoordinator.removeActiveDownstream(who);
		mOffload.excludeDownstreamInterface(who.interfaceName());
		mForwardedDownstreams.remove(who);
		updateConnectedClients(null /* wifiClients */);

		// If this is a Wi-Fi interface, tell WifiManager of any errors
		// or the inactive serving state.
		@@ -2157,6 +2156,12 @@ public class Tethering {
		return false;
		}

		private void updateConnectedClients(final List<WifiClient> wifiClients) {
		if (mConnectedClientsTracker.updateConnectedClients(mForwardedDownstreams, wifiClients)) {
		reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
		}
		}

		private IpServer.Callback makeControlCallback() {
		return new IpServer.Callback() {
		@Override
		@@ -2171,10 +2176,7 @@ public class Tethering {

		@Override
		public void dhcpLeasesChanged() {
		if (mConnectedClientsTracker.updateConnectedClients(
		mForwardedDownstreams, null /* wifiClients */)) {
		reportTetherClientsChanged(mConnectedClientsTracker.getLastTetheredClients());
		}
		updateConnectedClients(null /* wifiClients */);
		}
		};
		}