LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I2292c1cb,I8f60c137 into rvc-dev

Browse Source 
* changes:
  Test that IpNeighborMonitor is stopped when IpServer stops.
  Memory leak due to no stop for IpNeighborMonitor.
This commit is contained in:
TreeHugger Robot
2020-06-19 06:36:50 +00:00
committed by Android (Google) Code Review
parent a4a8a315fe 9644bc01dd
commit aee09af636
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Tethering/src/android/net/ip/IpServer.java
View File

@@ -1322,6 +1322,7 @@ public class IpServer extends StateMachine {
class UnavailableState extends State { class UnavailableState extends State {
@Override @Override
public void enter() { public void enter() {
mIpNeighborMonitor.stop();
mLastError = TetheringManager.TETHER_ERROR_NO_ERROR; mLastError = TetheringManager.TETHER_ERROR_NO_ERROR;
sendInterfaceState(STATE_UNAVAILABLE); sendInterfaceState(STATE_UNAVAILABLE);
} }

1
Tethering/tests/unit/src/android/net/ip/IpServerTest.java
View File

@@ -860,6 +860,7 @@ public class IpServerTest {
verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer); verify(mBpfCoordinator).tetherOffloadRuleClear(mIpServer);
verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA)); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighA, macA));
verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB)); verify(mNetd).tetherOffloadRuleRemove(matches(UPSTREAM_IFINDEX, neighB, macB));
verify(mIpNeighborMonitor).stop();
resetNetdAndBpfCoordinator(); resetNetdAndBpfCoordinator();
} }