summaryrefslogtreecommitdiff
path: root/wifi
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2020-12-15 09:02:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-15 09:02:55 +0000
commiteada640d5d9cd7941495c860654b1b66f7e4efa8 (patch)
tree1c4f0ad036227ffbfe9fc1b3a4bb052a6be9c168 /wifi
parent6557000a116008de7abfa2c49cef5192a2894856 (diff)
parentdac4ac4fdc1b578d28f6482007ac35d7719ff163 (diff)
Merge changes from topic "tcp_keepalive_fix"
* changes: Use API TcpKeepalivePacketData in ClientModeImpl Add TcpKeepalivePacketData to SystemApi
Diffstat (limited to 'wifi')
-rw-r--r--wifi/jarjar-rules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index 75b5e728eb0d..4099c27a0fae 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -21,6 +21,7 @@ rule android.net.ProvisioningConfigurationParcelable* com.android.wifi.x.@0
rule android.net.ResolverParamsParcel* com.android.wifi.x.@0
rule android.net.RouteInfoParcel* com.android.wifi.x.@0
rule android.net.ScanResultInfoParcelable* com.android.wifi.x.@0
+rule android.net.TcpKeepalivePacketDataParcelable* com.android.wifi.x.@0
rule android.net.TetherConfigParcel* com.android.wifi.x.@0
rule android.net.TetherOffloadRuleParcel* com.android.wifi.x.@0
rule android.net.TetherStatsParcel* com.android.wifi.x.@0
@@ -43,7 +44,6 @@ rule android.net.DhcpResults* com.android.wifi.x.@0
rule android.net.InterfaceConfiguration* com.android.wifi.x.@0
rule android.net.IpMemoryStore* com.android.wifi.x.@0
rule android.net.NetworkMonitorManager* com.android.wifi.x.@0
-rule android.net.TcpKeepalivePacketData* com.android.wifi.x.@0
rule android.net.NetworkFactory* com.android.wifi.x.@0
rule android.net.ip.IpClientCallbacks* com.android.wifi.x.@0
rule android.net.ip.IpClientManager* com.android.wifi.x.@0