Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94

Browse Source 
Change-Id: I4787c024dcd21cf86b9984a6207f2419839b1b28
This commit is contained in:
Automerger Merge Worker
2020-03-09 05:35:22 +00:00
parent 95ddb47889 3b0a1b9b94
commit 4167b495e0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
View File

@@ -624,16 +624,15 @@ public class IpServerTest {
* @param v6lp IPv6 LinkProperties of the upstream interface, or null for an IPv4-only upstream. * @param v6lp IPv6 LinkProperties of the upstream interface, or null for an IPv4-only upstream.
*/ */
private void dispatchTetherConnectionChanged(String upstreamIface, LinkProperties v6lp) { private void dispatchTetherConnectionChanged(String upstreamIface, LinkProperties v6lp) {
mIpServer.sendMessage(IpServer.CMD_TETHER_CONNECTION_CHANGED, dispatchTetherConnectionChanged(upstreamIface);
new InterfaceSet(upstreamIface)); mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp);
if (v6lp != null) {
mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp);
}
mLooper.dispatchAll(); mLooper.dispatchAll();
} }
private void dispatchTetherConnectionChanged(String upstreamIface) { private void dispatchTetherConnectionChanged(String upstreamIface) {
dispatchTetherConnectionChanged(upstreamIface, null); final InterfaceSet ifs = (upstreamIface != null) ? new InterfaceSet(upstreamIface) : null;
mIpServer.sendMessage(IpServer.CMD_TETHER_CONNECTION_CHANGED, ifs);
mLooper.dispatchAll();
} }
private void assertIPv4AddressAndDirectlyConnectedRoute(LinkProperties lp) { private void assertIPv4AddressAndDirectlyConnectedRoute(LinkProperties lp) {