commit 8997b6c8e1243dfb823e651133d23c1c0489e948
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 20 03:14:30 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 20 03:22:10 2020 +0000
tree cfd4ab09a2d4604161291746d4d2a6f9a8ba1798
parent 1a09018e55fb57962799a64586cf2976fd87c3c1
parent 36eab72880cff8f34e47ffc3e9792d0ace912c87

Make change and version bump to r_aml_300802200 for mainline module file: packages/Tethering/apex/manifest.json

Change-Id: Ibddfd670698e66c42797c61e7020c1382fecb2bf

Tethering/apex/manifest.json

diff --git a/Tethering/apex/manifest.json b/Tethering/apex/manifest.json
index 6e6fd1e..314b642 100644
--- a/Tethering/apex/manifest.json
+++ b/Tethering/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.tethering",
-  "version": 300802100
+  "version": 300802200
 }

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 5239947..35c1563 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -616,8 +616,9 @@
 
         final Boolean setIfaceUp;
         if (mInterfaceType == TetheringManager.TETHERING_WIFI
-                || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P) {
-            // The WiFi stack has ownership of the interface up/down state.
+                || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P
+                || mInterfaceType == TetheringManager.TETHERING_ETHERNET) {
+            // The WiFi and Ethernet stack has ownership of the interface up/down state.
             // It is unclear whether the Bluetooth or USB stacks will manage their own
             // state.
             setIfaceUp = null;
@@ -1322,6 +1323,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 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();
     }