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

Commit 9dd36d01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a log message if enabling Ethernet tethering if it is already... 

Merge "Add a log message if enabling Ethernet tethering if it is already enabled." am: abe9621f am: ee5c1678 am: e6b8ded8 am: 9bf7e498

Change-Id: I065b607384d6d6e720036c7ab80d1c8eabc34b02
parents 8e2f23fe 9bf7e498

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -635,7 +635,10 @@ public class Tethering { 
                Context.ETHERNET_SERVICE);

                Context.ETHERNET_SERVICE);

        synchronized (mPublicSync) {

        synchronized (mPublicSync) {

            if (enable) {

            if (enable) {

                if (mEthernetCallback != null) return TETHER_ERROR_NO_ERROR;

                if (mEthernetCallback != null) {

                    Log.d(TAG, "Ethernet tethering already started");

                    return TETHER_ERROR_NO_ERROR;

                }





                mEthernetCallback = new EthernetCallback();

                mEthernetCallback = new EthernetCallback();

                mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);

                mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);