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
This commit is contained in:
TreeHugger Robot
2020-06-19 08:29:30 +00:00
committed by Automerger Merge Worker

View File

@@ -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;