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

Commit d5855ca6 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

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

Change-Id: I1bc40afe2fb72b312e493da6142fdd72e9321f84
parents 5624b97e 005cf1b1

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;