From f718c51499a360d2b7d8e503e222037cc159338d Mon Sep 17 00:00:00 2001 From: Andrei Onea Date: Tue, 5 May 2020 16:08:06 +0100 Subject: [PATCH] Jarjar duplicate classes Add jarjar rule for extra .aidl classes android.net.DataStallReportParcelable and android.net.NetworkTestResultParcelable . Test: atest CtsStrictJavaPackagesTestCases Bug: 155682584 Change-Id: I4a1fe9fca444cd61502d60799010481be8f9efec --- wifi/jarjar-rules.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index e55a89fddd0c1..26927e56d2fac 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -1,6 +1,7 @@ ## used by service-wifi ## # Network Stack AIDL interface. +rule android.net.DataStallReportParcelable* com.android.wifi.x.@0 rule android.net.DhcpResultsParcelable* com.android.wifi.x.@0 rule android.net.IIpMemoryStore* com.android.wifi.x.@0 rule android.net.IIpMemoryStoreCallbacks* com.android.wifi.x.@0 @@ -14,6 +15,7 @@ rule android.net.Layer2InformationParcelable* com.android.wifi.x.@0 rule android.net.Layer2PacketParcelable* com.android.wifi.x.@0 rule android.net.MarkMaskParcel* com.android.wifi.x.@0 rule android.net.NattKeepalivePacketDataParcelable* com.android.wifi.x.@0 +rule android.net.NetworkTestResultParcelable* com.android.wifi.x.@0 rule android.net.PrivateDnsConfigParcel* com.android.wifi.x.@0 rule android.net.ProvisioningConfigurationParcelable* com.android.wifi.x.@0 rule android.net.ResolverParamsParcel* com.android.wifi.x.@0