diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-19 08:28:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 08:28:26 +0000 |
| commit | ebcd7131a15a3dbf73a573b65d28e5334ac24f87 (patch) | |
| tree | 41583379cfc220355257a98fc69600d2c8d600f8 | |
| parent | d8a97e64b5cb820fc6b8bae8ff90616beade4afb (diff) | |
| parent | 675697222aa441cc2cc0b8e65182eb5d7c5f28d5 (diff) | |
Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: I2a5179ac64f00bf6a4254ded6318d6f1c6f9fd6c
| -rw-r--r-- | Tethering/src/android/net/ip/IpServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index c436be2e9b..35c156304c 100644 --- a/Tethering/src/android/net/ip/IpServer.java +++ b/Tethering/src/android/net/ip/IpServer.java @@ -616,8 +616,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; |