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

Commit 1e2669e7 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... 

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

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

Change-Id: Ia503103518ac40046c3adaec4ad6f0d29bede74d
parents 046bc5d7 0659449c

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;