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

Commit 0659449c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dc 

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

Change-Id: I2a5179ac64f00bf6a4254ded6318d6f1c6f9fd6c
parents c32bb057 28c2d1dc

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;