Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5fe55ed authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Fix TetheredClient and TetheredClientTest"

parents 9dd718c5 c641c227

packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

packages/Tethering/tests/unit/src/android/net/TetheredClientTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class TetheredClientTest { 
        assertNotEquals(makeTestClient(), TetheredClient(

                TEST_MACADDR,

                listOf(TEST_ADDRINFO1, TEST_ADDRINFO2),

                TETHERING_BLUETOOTH))

                TETHERING_USB))

    }



    @Test