From ed0fdd959d33ec513fb74c56b99fc9ffd21f5994 Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Wed, 14 Oct 2020 21:23:25 +0900 Subject: [PATCH] Add jarjar rule for IPv6ProvisioningLossQuirk. A new stable parcelable IPv6ProvisioningLossQuirk added in network stack module, which is used to record the network quirk info which causes IPv6 provisioning loss, e.g. the router lifetime in RA is 0 and the default route will be removed from LinkProperties. Previously this change breaks CtsStrictJavaPackagesTestCases due to a jarjar rule is missed. Also rename the package name based on the revert change. Also include slight stable AIDL package and variable rename. Bug: 157534516 Test: atest CtsStrictJavaPackagesTestCases FrameworksNetTests Change-Id: Ic2f6b75beefb574f7e2fb4c157667e7734eccd05 --- .../net/java/android/net/ipmemorystore/ParcelableTests.java | 6 +++--- .../server/net/ipmemorystore/NetworkAttributesTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/net/java/android/net/ipmemorystore/ParcelableTests.java b/tests/net/java/android/net/ipmemorystore/ParcelableTests.java index 1d3635709e..603c875195 100644 --- a/tests/net/java/android/net/ipmemorystore/ParcelableTests.java +++ b/tests/net/java/android/net/ipmemorystore/ParcelableTests.java @@ -19,8 +19,8 @@ package android.net.ipmemorystore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.net.quirks.IPv6ProvisioningLossQuirk; -import android.net.quirks.IPv6ProvisioningLossQuirkParcelable; +import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; +import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable; import android.os.Parcel; import android.os.Parcelable; @@ -119,7 +119,7 @@ public class ParcelableTests { final NetworkAttributes in = builder.build(); final NetworkAttributes out = new NetworkAttributes(parcelingRoundTrip(in.toParcelable())); - assertEquals(out.ipv6ProvLossQuirk, in.ipv6ProvLossQuirk); + assertEquals(out.ipv6ProvisioningLossQuirk, in.ipv6ProvisioningLossQuirk); } private T parcelingRoundTrip(final T in) throws Exception { diff --git a/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java b/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java index cdf4b3f94f..ebbc0ef625 100644 --- a/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java +++ b/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java @@ -19,7 +19,7 @@ package com.android.server.net.ipmemorystore; import static org.junit.Assert.assertEquals; 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.runner.AndroidJUnit4; @@ -53,7 +53,7 @@ public class NetworkAttributesTest { } assertEquals(sum, NetworkAttributes.TOTAL_WEIGHT, EPSILON); - final IPv6ProvisioningLossQuirk ipv6ProvLossQuirk = + final IPv6ProvisioningLossQuirk ipv6ProvisioningLossQuirk = new IPv6ProvisioningLossQuirk(3, System.currentTimeMillis() + 7_200_000); // Use directly the constructor with all attributes, and make sure that when compared // to itself the score is a clean 1.0f. @@ -64,7 +64,7 @@ public class NetworkAttributesTest { "some hint", Arrays.asList(Inet4Address.getByAddress(new byte[] {5, 6, 7, 8}), Inet4Address.getByAddress(new byte[] {9, 0, 1, 2})), - 98, ipv6ProvLossQuirk); + 98, ipv6ProvisioningLossQuirk); assertEquals(1.0f, na.getNetworkGroupSamenessConfidence(na), EPSILON); } }