Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb4a0728 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I15e3226be1337ad76c8bbd275db91600673979fe
parents a5edc985 ef511f8b

packages/Tethering/src/android/net/ip/IpServer.java

+3 −2
Original line number Diff line number Diff line
@@ -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;