Merge "Fix TetheredClient and TetheredClientTest" am: e5fe55eddf

Change-Id: I4c9eae17b06e37ef5bb35d0f23e572e6edd0b579
2020-02-12 22:22:37 +00:00
parent 894c9db9f5 e5fe55eddf
commit 8ab2f58ab9
2 changed files with 3 additions and 3 deletions
--- 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);
--- 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