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

Merge "Fix TetheredClient and TetheredClientTest"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2020-02-12 21:58:07 +00:00
committed by Gerrit Code Review
parent b03a821085 bb60ee8f10
commit 8451e20d98
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/common/TetheringLib/src/android/net/TetheredClient.java
View File

@@ -25,7 +25,7 @@ import android.os.Parcelable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -83,7 +83,7 @@ public final class TetheredClient implements Parcelable {
* @hide * @hide
*/ */
public TetheredClient addAddresses(@NonNull TetheredClient other) { public TetheredClient addAddresses(@NonNull TetheredClient other) {
final HashSet<AddressInfo> newAddresses = new HashSet<>( final LinkedHashSet<AddressInfo> newAddresses = new LinkedHashSet<>(
mAddresses.size() + other.mAddresses.size()); mAddresses.size() + other.mAddresses.size());
newAddresses.addAll(mAddresses); newAddresses.addAll(mAddresses);
newAddresses.addAll(other.mAddresses); newAddresses.addAll(other.mAddresses);

2
Tethering/tests/unit/src/android/net/TetheredClientTest.kt
View File

@@ -75,7 +75,7 @@ class TetheredClientTest {
assertNotEquals(makeTestClient(), TetheredClient( assertNotEquals(makeTestClient(), TetheredClient(
TEST_MACADDR, TEST_MACADDR,
listOf(TEST_ADDRINFO1, TEST_ADDRINFO2), listOf(TEST_ADDRINFO1, TEST_ADDRINFO2),
TETHERING_BLUETOOTH)) TETHERING_USB))
} }
@Test @Test