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

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

Merge "Add future consideration for USB rndis notification handling" into... 

Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev am: 15fbf978 am: 5ab82f94
am: 394b5574

Change-Id: I891cd82b0e8af1049fa3ab9b0a95a2a9ab2e0b26
parents 4c63eaf6 394b5574

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

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

            synchronized (Tethering.this.mPublicSync) {

                // 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;



                if (usbConnected && !usbConfigured) {