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

Commit 1115ecda authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I2292c1cb,I8f60c137 into rvc-dev 

* changes:
  Test that IpNeighborMonitor is stopped when IpServer stops.
  Memory leak due to no stop for IpNeighborMonitor.
parents ec09cbef 83f6a384

packages/Tethering/src/android/net/ip/IpServer.java

+1 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,7 @@ public class IpServer extends StateMachine { 
    class UnavailableState extends State {

        @Override

        public void enter() {

            mIpNeighborMonitor.stop();

            mLastError = TetheringManager.TETHER_ERROR_NO_ERROR;

            sendInterfaceState(STATE_UNAVAILABLE);

        }

packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ public class IpServerTest { 
        verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer);

        verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA));

        verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB));

        verify(mIpNeighborMonitor).stop();

        resetNetdAndBpfCoordinator();

    }