Merge changes I2292c1cb,I8f60c137 into rvc-dev am: 1115ecda57 am: f4e7d32a7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887 Change-Id: I56b761cf4c35b0f7a84ad210735471ca3d30038d
2020-06-19 07:02:04 +00:00
parent ebc04eff8c f4e7d32a7a
commit d861765f0e
1 changed files with 1 additions and 0 deletions
--- a/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
+++ b/packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
@@ -860,6 +860,7 @@ public class IpServerTest {
        verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer);
        verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA));
        verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB));
+        verify(mIpNeighborMonitor).stop();
        resetNetdAndBpfCoordinator();
    }