commit ac8445ca3bd140874512e4200306e490721d4879
author Mark Chien <markchien@google.com> Fri Jun 19 05:55:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 19 05:55:35 2020 +0000
tree 3258971f64364e8344228f8f7c2f30816d774352
parent 3fd7eb2154b72211cb37fda5e1787d3b90a717d6
parent 9807816e094d716336a6061bff26521630082308

Merge "Let only Ethernet manage ethernet interface up and down"

Tethering/src/android/net/ip/IpServer.java

diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java
index 4cc35b4..e24fc29 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -1322,6 +1322,7 @@
     class UnavailableState extends State {
         @Override
         public void enter() {
+            mIpNeighborMonitor.stop();
             mLastError = TetheringManager.TETHER_ERROR_NO_ERROR;
             sendInterfaceState(STATE_UNAVAILABLE);
         }

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

diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
index 4f88605..05cf58a 100644
--- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
+++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
@@ -859,6 +859,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();
     }