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

Commit 8281abfd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Release the interface request when Ethernet tethering is stopped."

parents 784474bb 925c8bab

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

+9 −9
Original line number Diff line number Diff line
@@ -640,22 +640,22 @@ public class Tethering { 
                mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);

            } else {

                stopEthernetTetheringLocked();

                if (mEthernetCallback != null) {

                    mEthernetIfaceRequest.release();

                    mEthernetCallback = null;

                    mEthernetIfaceRequest = null;

                }

            }

        }

        return TETHER_ERROR_NO_ERROR;

    }



    private void stopEthernetTetheringLocked() {

        if (mConfiguredEthernetIface == null) return;

        changeInterfaceState(mConfiguredEthernetIface, IpServer.STATE_AVAILABLE);

        if (mConfiguredEthernetIface != null) {

            stopTrackingInterfaceLocked(mConfiguredEthernetIface);

            mConfiguredEthernetIface = null;

        }

        if (mEthernetCallback != null) {

            mEthernetIfaceRequest.release();

            mEthernetCallback = null;

            mEthernetIfaceRequest = null;

        }

    }



    private class EthernetCallback implements EthernetManager.TetheredInterfaceCallback {

        @Override