Merge "Jarjar duplicate classes" into rvc-dev am: ffc478d673 (17648445) · Commits · e / os / android_frameworks_base

wifi/jarjar-rules.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	## used by service-wifi ##		## used by service-wifi ##

	# Network Stack AIDL interface.		# 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.DhcpResultsParcelable* com.android.wifi.x.@0
	rule android.net.IIpMemoryStore* com.android.wifi.x.@0		rule android.net.IIpMemoryStore* com.android.wifi.x.@0
	rule android.net.IIpMemoryStoreCallbacks* 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.Layer2PacketParcelable* com.android.wifi.x.@0
	rule android.net.MarkMaskParcel* 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.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.PrivateDnsConfigParcel* com.android.wifi.x.@0
	rule android.net.ProvisioningConfigurationParcelable* com.android.wifi.x.@0		rule android.net.ProvisioningConfigurationParcelable* com.android.wifi.x.@0
	rule android.net.ResolverParamsParcel* com.android.wifi.x.@0		rule android.net.ResolverParamsParcel* com.android.wifi.x.@0