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."

Browse Source
This commit is contained in:
Lorenzo Colitti
2020-02-23 10:18:02 +00:00
committed by Gerrit Code Review
parent 131380ff26 03a734f352
commit a429d3b551
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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));
if (v6lp != null) {
mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp); 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) {