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

Merge "Support losing the upstream in IpServerTest." am: a429d3b551 am: fc63250a1a

Browse Source 
Change-Id: Ic77f0af05fe094485ce78fd44c2f2d009a257164
This commit is contained in:
Automerger Merge Worker
2020-02-23 10:56:48 +00:00
parent 410a97588b a429d3b551
commit b3d6f2d23f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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) {