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

Commit cda7df10 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix TetheredClient and TetheredClientTest" am: e5fe55ed am: 8ab2f58a am: c8190ff3 

Change-Id: I8a3d01dbd02639e07284a3dc6798c0db512c8307
parents b0f1fe88 c8190ff3

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

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