| commit | 930a956e5077252e9dac4bb301dccb4dd7f2ea68 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 06:51:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 06:51:45 2020 +0000 |
| tree | eee8ab40d552f38a3b457a15b718d4f5521d440d | |
| parent | d6741dcc4af53fc766b7b2d4ff2f33f403d556a4 [diff] | |
| parent | aee09af63600fb483fbb46893be64d7c182a6d8d [diff] |
Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887 Change-Id: Ifacd13ca8fc146c1a3f01ddf38dc9aed7678f08f
diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index c65069c..30a9d22 100644 --- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
@@ -860,6 +860,7 @@ verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA)); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB)); + verify(mIpNeighborMonitor).stop(); resetNetdAndBpfCoordinator(); }