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

Commit 484d0e1a authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Lorenzo Colitti
Browse files

Support losing the upstream in IpServerTest. 

Allow dispatchTetherConnectionChanged to pass in a null
upstream interface and/or null LinkProperties. This will allow
future tests to check what happens when the upstream interface
goes away.

Bug: 149963652
Test: test-only change
Change-Id: I7cfc32d072f23644159d33700d6cd830c426ea19
Merged-In: I7cfc32d072f23644159d33700d6cd830c426ea19
(cherry picked from commit 62457f17)
parent 4bfc09b5

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