diff options
| author | 2020-02-12 22:22:37 +0000 | |
|---|---|---|
| committer | 2020-02-12 22:22:37 +0000 | |
| commit | 8ab2f58ab90e887da93a8045b7b6ab415dc9b823 (patch) | |
| tree | 14cd2726585dbc2a53106e04ff03803b2907afe1 | |
| parent | 894c9db9f5455e36db63ae753e6d12548178f4e0 (diff) | |
| parent | e5fe55eddfaece5b24125258d19ecca4e63e1c94 (diff) | |
Merge "Fix TetheredClient and TetheredClientTest" am: e5fe55eddf
Change-Id: I4c9eae17b06e37ef5bb35d0f23e572e6edd0b579
| -rw-r--r-- | packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java | 4 | ||||
| -rw-r--r-- | packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java b/packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java index 651468846ca8..f5c96642544c 100644 --- a/packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java +++ b/packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java @@ -25,7 +25,7 @@ import android.os.Parcelable; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; @@ -83,7 +83,7 @@ public final class TetheredClient implements Parcelable { * @hide */ public TetheredClient addAddresses(@NonNull TetheredClient other) { - final HashSet<AddressInfo> newAddresses = new HashSet<>( + final LinkedHashSet<AddressInfo> newAddresses = new LinkedHashSet<>( mAddresses.size() + other.mAddresses.size()); newAddresses.addAll(mAddresses); newAddresses.addAll(other.mAddresses); diff --git a/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt b/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt index 83c19ec14d56..d85389aeb625 100644 --- a/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt +++ b/packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt @@ -75,7 +75,7 @@ class TetheredClientTest { assertNotEquals(makeTestClient(), TetheredClient( TEST_MACADDR, listOf(TEST_ADDRINFO1, TEST_ADDRINFO2), - TETHERING_BLUETOOTH)) + TETHERING_USB)) } @Test |