Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let only Ethernet manage ethernet interface up and down" am: ef511f8ba8

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

Change-Id: I15e3226be1337ad76c8bbd275db91600673979fe
This commit is contained in:
Mark Chien
2020-06-19 06:11:40 +00:00
committed by Automerger Merge Worker
parent a5edc98546 ef511f8ba8
commit eb4a072814
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Tethering/src/android/net/ip/IpServer.java
View File

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