Merge "Update connected clients when a downstream disappears." into rvc-dev am: 13ff35faab (2aba196d) · Commits · e / os / android_frameworks_base

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

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -433,9 +433,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());
	}
	}		}
	}		}

	@@ -1575,6 +1573,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.
	@@ -2157,6 +2156,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
	@@ -2171,10 +2176,7 @@ public class Tethering {

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