Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 774c2da1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Support losing the upstream in IpServerTest." am: 8a656211 am: fc63250a am: abc53a51 

Change-Id: Ic241e4f7d0356910fe47e8c4b9fbc694270836d0
parents a7cb68e1 abc53a51

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

+5 −6
Original line number Diff line number Diff line
@@ -624,16 +624,15 @@ public class IpServerTest { 
     * @param v6lp IPv6 LinkProperties of the upstream interface, or null for an IPv4-only upstream.

     */

    private void dispatchTetherConnectionChanged(String upstreamIface, LinkProperties v6lp) {

        mIpServer.sendMessage(IpServer.CMD_TETHER_CONNECTION_CHANGED,

                new InterfaceSet(upstreamIface));

        if (v6lp != null) {

        dispatchTetherConnectionChanged(upstreamIface);

        mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp);

        }

        mLooper.dispatchAll();

    }



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