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

Commit ce7403cd authored by Mark Chien's avatar Mark Chien
Browse files

Let only Ethernet manage ethernet interface up and down 

When LAN link is changed for using ethernet interface from Ethernet tethering to Ethernet,
there is confiict as Ethernet Tethering is trying to make ethernet link down and Ethernet is trying to make ethernet link up.

So, this would make Ethernet only manage ethernet interface link state.

Test: manual
Bug: 130840861
Merged-In: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
Change-Id: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
parent 44b233c5

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

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