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

Commit ff14dd12 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed 

am: 6ff07301

Change-Id: I2e755679bfea1cdb86a645948b32820c2d8dbf50
parents 1199972d 6ff07301

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -834,6 +834,16 @@ public class Tethering extends BaseNetworkObserver { 
            // For more explanation, see b/62552150 .

            // For more explanation, see b/62552150 .

            synchronized (Tethering.this.mPublicSync) {

            synchronized (Tethering.this.mPublicSync) {

                // Always record the state of RNDIS.

                // Always record the state of RNDIS.

                // TODO: consider:

                //     final boolean disconnected = !usbConnected;

                //     if (disconnected) {

                //         mRndisEnabled = false;

                //         mUsbTetherRequested = false;

                //         return;

                //     }

                //     final boolean configured = usbConnected && usbConfigured;

                //     mRndisEnabled = configured ? rndisEnabled : false;

                //     if (!configured) return;

                mRndisEnabled = rndisEnabled;

                mRndisEnabled = rndisEnabled;





                if (usbConnected && !usbConfigured) {

                if (usbConnected && !usbConfigured) {