From 484d0e1a7ac05d7c665f8c7cde76a3e6993dce20 Mon Sep 17 00:00:00 2001 From: Automerger Merge Worker Date: Sun, 23 Feb 2020 10:56:46 +0000 Subject: [PATCH] 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 62457f17e72c7ef0bee5c5bb1a04935a549b9fe6) --- .../tests/unit/src/android/net/ip/IpServerTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index 33b35586eecf1..39742f5bd4f65 100644 --- a/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java @@ -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) { - mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp); - } + 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) {