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

Commit 3905c384 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge \"Merge \\"Stop listening for WiFi interface status changes\\" into... 

Merge \"Merge \\"Stop listening for WiFi interface status changes\\" into nyc-mr1-dev am: 377a8dd1\" into nyc-mr1-dev-plus-aosp
am: c6b80c3b

Change-Id: I91eb857d68bc63566c619493eb1de974dd12abe8
parents c356d767 c6b80c3b

services/core/java/com/android/server/connectivity/Tethering.java

+7 −5
Original line number Diff line number Diff line
@@ -270,14 +270,16 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering 
                    trackNewTetherableInterface(iface, interfaceType);

                }

            } else {

                if (interfaceType == ConnectivityManager.TETHERING_USB) {

                    // ignore usb0 down after enabling RNDIS

                    // we will handle disconnect in interfaceRemoved instead

                    if (VDBG) Log.d(TAG, "ignore interface down for " + iface);

                } else if (tetherState != null) {

                if (interfaceType == ConnectivityManager.TETHERING_BLUETOOTH) {

                    tetherState.mStateMachine.sendMessage(

                            TetherInterfaceStateMachine.CMD_INTERFACE_DOWN);

                    mTetherStates.remove(iface);

                } else {

                    // Ignore usb0 down after enabling RNDIS.

                    // We will handle disconnect in interfaceRemoved.

                    // Similarly, ignore interface down for WiFi.  We monitor WiFi AP status

                    // through the WifiManager.WIFI_AP_STATE_CHANGED_ACTION intent.

                    if (VDBG) Log.d(TAG, "ignore interface down for " + iface);

                }

            }

        }