Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat."

This commit is contained in:
Lorenzo Colitti
2021-06-09 07:59:25 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 12 deletions

View File

@@ -8631,13 +8631,8 @@ public class ConnectivityServiceTest {
// Disconnect the network. clat is stopped and the network is destroyed.
mCellNetworkAgent.disconnect();
networkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);
// TODO: delete this spurious onLinkPropertiesChanged callback.
networkCallback.expectLinkPropertiesThat(mCellNetworkAgent,
lp -> lp.getStackedLinks().isEmpty());
networkCallback.assertNoCallback();
verify(mMockNetd).clatdStop(MOBILE_IFNAME);
verify(mMockNetd).networkRemoveInterface(cellNetId, CLAT_MOBILE_IFNAME);
assertRoutesRemoved(cellNetId, stackedDefault);
verify(mMockNetd).idletimerRemoveInterface(eq(MOBILE_IFNAME), anyInt(),
eq(Integer.toString(TRANSPORT_CELLULAR)));
verify(mMockNetd).networkDestroy(cellNetId);