| commit | 36eab72880cff8f34e47ffc3e9792d0ace912c87 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 19 08:29:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 08:29:30 2020 +0000 |
| tree | 41583379cfc220355257a98fc69600d2c8d600f8 | |
| parent | 930a956e5077252e9dac4bb301dccb4dd7f2ea68 [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: I3153f51a66df5eaf2f220ed50c2a83de960b83f7
diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index c436be2..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;