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

Merge "Fix TetheredClient and TetheredClientTest" am: 8451e20d98 am: 8ab2f58ab9 am: c8190ff316

Browse Source 
Change-Id: I8a3d01dbd02639e07284a3dc6798c0db512c8307
This commit is contained in:
Automerger Merge Worker
2020-02-12 23:11:04 +00:00
parent 481eb3b9fc 8451e20d98
commit 545995255d
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

@@ -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);