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

Commit 651ebee2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Release the interface request when Ethernet tethering is stopped." am: 8281abfd 

Change-Id: Ia0491c302528ce0a727c1ffa77a1fc3a7508f601
parents 5ebda667 8281abfd

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