Merge changes from topic...

Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4 am: aa24ca01

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

Change-Id: Ibfd085b283caf6a531cbdf752e009317eb105287

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 extends Parcelable> T parcelingRoundTrip(final T in) throws Exception {

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

wifi/jarjar-rules.txt

@@ -36,6 +36,7 @@ rule android.net.ipmemorystore.IOnStatusListener* com.android.wifi.x.@0
 rule android.net.ipmemorystore.NetworkAttributesParcelable* com.android.wifi.x.@0
 rule android.net.ipmemorystore.SameL3NetworkResponseParcelable* com.android.wifi.x.@0
 rule android.net.ipmemorystore.StatusParcelable* com.android.wifi.x.@0
+rule android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk* com.android.wifi.x.@0
 
 # Net utils (includes Network Stack helper classes).
 rule android.net.DhcpResults* com.android.wifi.x.@0