Merge "Let only Ethernet manage ethernet interface up and down" am: ac8445ca3b am: eb4a072814 am: 0d3aeb6139 am: 74698ef2a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317394

Change-Id: I1bc40afe2fb72b312e493da6142fdd72e9321f84
This commit is contained in:
Mark Chien
2020-06-19 06:43:05 +00:00
committed by Automerger Merge Worker

View File

@@ -616,8 +616,9 @@ public class IpServer extends StateMachine {
final Boolean setIfaceUp; final Boolean setIfaceUp;
if (mInterfaceType == TetheringManager.TETHERING_WIFI if (mInterfaceType == TetheringManager.TETHERING_WIFI
|| mInterfaceType == TetheringManager.TETHERING_WIFI_P2P) { || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P
// The WiFi stack has ownership of the interface up/down state. || 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 // It is unclear whether the Bluetooth or USB stacks will manage their own
// state. // state.
setIfaceUp = null; setIfaceUp = null;