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

Commit f38d119a 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... 

Merge "Let only Ethernet manage ethernet interface up and down" am: ef511f8b am: eb4a0728 am: ea1eabac am: 005cf1b1 am: d5855ca6

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

Change-Id: Ic1b5a996c60665ecbc1a5a3e29435eb65bfec475
parents 23bdeaf6 d5855ca6

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;