diff options
| author | Mark Chien <markchien@google.com> | 2020-06-19 05:55:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-19 05:55:35 +0000 |
| commit | ef511f8ba8a0bab8cf28d770ec34a22865845baf (patch) | |
| tree | f0c0d7592075a5cb8332edd44218ba588464808d | |
| parent | d4e50ab409c0b0b4b5fdb3b0916fc607a8c70f9e (diff) | |
| parent | 63a6065cd233b83c576d449de78db918593fb2ea (diff) | |
Merge "Let only Ethernet manage ethernet interface up and down"
| -rw-r--r-- | packages/Tethering/src/android/net/ip/IpServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/Tethering/src/android/net/ip/IpServer.java b/packages/Tethering/src/android/net/ip/IpServer.java index 2871e7f682c6..e24fc2958933 100644 --- a/packages/Tethering/src/android/net/ip/IpServer.java +++ b/packages/Tethering/src/android/net/ip/IpServer.java @@ -615,8 +615,9 @@ public class IpServer extends StateMachine { 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; |