e4135287005280f296122781e1b05018423cf572 - platform_frameworks_base

commit	e4135287005280f296122781e1b05018423cf572	[log] [tgz]
author	junyulai <junyulai@google.com>	Thu Jan 03 18:50:15 2019 +0800
committer	Chalard Jean <jchalard@google.com>	Mon Feb 04 04:06:22 2019 +0000
tree	454aae0ff4cd8ee7df865f650dc3696ca3cd38a5
parent	7343460cd0a7957966b31a263c261dcaf337eb78 [diff]

[KA02] internal cleanup and refactor for SocketKeepalive

In previous change, the new SocketKeepalive API was exported.
But internally, old PacketKeepalive names and structures are
still used.

This change rename them properly for code consistency and also
refactor KeepalivePacketData to support different types of
KeepalivePacketData.

(clean cherry-pick from aosp/860394)

Bug: 114151147
Test: 1. atest FrameworksNetTests
      2. atest FrameworksWifiTests
      3. atest FrameworksTelephonyTests

Change-Id: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e

core/java/android/net/ConnectivityManager.java[diff]
core/java/android/net/KeepalivePacketData.java[diff]
core/java/android/net/NattKeepalivePacketData.java[Added - diff]
core/java/android/net/NetworkAgent.java[diff]
core/java/android/net/SocketKeepalive.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/connectivity/KeepaliveTracker.java[diff]
tests/net/java/com/android/server/ConnectivityServiceTest.java[diff]

8 files changed