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 2871e7f..e24fc29 100644
--- a/Tethering/src/android/net/ip/IpServer.java
+++ b/Tethering/src/android/net/ip/IpServer.java
@@ -615,8 +615,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;