| commit | 04c54aa9b1d7b189167551632a31d228ec9068ee | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Dec 11 07:28:21 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 11 07:28:21 2024 -0800 |
| tree | f4d5b1ac7f0148a1d6481e1b789963c056baa7f5 | |
| parent | d7d7511253592196229b6b37cef4deb4040560e1 [diff] | |
| parent | 6d41b0b77b7885b37a508cbf9fb1193bd50edc31 [diff] |
Merge "Do not release prefix too early" into main am: 6d41b0b77b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3403061 Change-Id: I4f4d1ad1e1ce213a25231241dca28b82135344e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java index 1608e1a..c329142 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java
@@ -189,7 +189,6 @@ final LinkAddress hotspotAddress = requestDownstreamAddress(mHotspotIpServer); final IpPrefix hotspotPrefix = asIpPrefix(hotspotAddress); assertNotEquals(asIpPrefix(mBluetoothAddress), hotspotPrefix); - releaseDownstream(mHotspotIpServer); // - Test previous enabled hotspot prefix(cached prefix) is reserved. when(mPrivateAddressCoordinator.getRandomInt()).thenReturn( @@ -208,6 +207,7 @@ assertNotEquals(asIpPrefix(mLegacyWifiP2pAddress), etherPrefix); assertNotEquals(asIpPrefix(mBluetoothAddress), etherPrefix); assertNotEquals(hotspotPrefix, etherPrefix); + releaseDownstream(mHotspotIpServer); releaseDownstream(mEthernetIpServer); }