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

Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 7167773060

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: I49ce3e1c7794dc6db0e410cba481eb98144bc4e5
This commit is contained in:
Xiao Ma
2020-10-29 06:17:22 +00:00
committed by Automerger Merge Worker
parent 662b48fa37 7167773060
commit 944185cd60
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/android/net/ipmemorystore/ParcelableTests.java
View File

@@ -19,8 +19,8 @@ package android.net.ipmemorystore;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.net.quirks.IPv6ProvisioningLossQuirk; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk;
import android.net.quirks.IPv6ProvisioningLossQuirkParcelable; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -119,7 +119,7 @@ public class ParcelableTests {
final NetworkAttributes in = builder.build(); final NetworkAttributes in = builder.build();
final NetworkAttributes out = new NetworkAttributes(parcelingRoundTrip(in.toParcelable())); final NetworkAttributes out = new NetworkAttributes(parcelingRoundTrip(in.toParcelable()));
assertEquals(out.ipv6ProvLossQuirk, in.ipv6ProvLossQuirk); assertEquals(out.ipv6ProvisioningLossQuirk, in.ipv6ProvisioningLossQuirk);
} }
private <T extends Parcelable> T parcelingRoundTrip(final T in) throws Exception { private <T extends Parcelable> T parcelingRoundTrip(final T in) throws Exception {

6
tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java
View File

@@ -19,7 +19,7 @@ package com.android.server.net.ipmemorystore;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.NetworkAttributes;
import android.net.quirks.IPv6ProvisioningLossQuirk; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
@@ -53,7 +53,7 @@ public class NetworkAttributesTest {
} }
assertEquals(sum, NetworkAttributes.TOTAL_WEIGHT, EPSILON); assertEquals(sum, NetworkAttributes.TOTAL_WEIGHT, EPSILON);
final IPv6ProvisioningLossQuirk ipv6ProvLossQuirk = final IPv6ProvisioningLossQuirk ipv6ProvisioningLossQuirk =
new IPv6ProvisioningLossQuirk(3, System.currentTimeMillis() + 7_200_000); new IPv6ProvisioningLossQuirk(3, System.currentTimeMillis() + 7_200_000);
// Use directly the constructor with all attributes, and make sure that when compared // Use directly the constructor with all attributes, and make sure that when compared
// to itself the score is a clean 1.0f. // to itself the score is a clean 1.0f.
@@ -64,7 +64,7 @@ public class NetworkAttributesTest {
"some hint", "some hint",
Arrays.asList(Inet4Address.getByAddress(new byte[] {5, 6, 7, 8}), Arrays.asList(Inet4Address.getByAddress(new byte[] {5, 6, 7, 8}),
Inet4Address.getByAddress(new byte[] {9, 0, 1, 2})), Inet4Address.getByAddress(new byte[] {9, 0, 1, 2})),
98, ipv6ProvLossQuirk); 98, ipv6ProvisioningLossQuirk);
assertEquals(1.0f, na.getNetworkGroupSamenessConfidence(na), EPSILON); assertEquals(1.0f, na.getNetworkGroupSamenessConfidence(na), EPSILON);
} }
} }