OSDN Git Service

[KA02] internal cleanup and refactor for SocketKeepalive
authorjunyulai <junyulai@google.com>
Thu, 3 Jan 2019 10:50:15 +0000 (18:50 +0800)
committerChalard Jean <jchalard@google.com>
Tue, 5 Feb 2019 11:13:47 +0000 (20:13 +0900)
commit06835112ab5b0714956468a6ae1bae4631a8adc9
treeedf3b7fba80565db9a2cbeb0e9d5ceff85040cfc
parent996f047394a86bb7e73a8b3ff29175cc4b9e571f
[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.

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

Change-Id: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e
Merged-In: Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e
core/java/android/net/ConnectivityManager.java
core/java/android/net/KeepalivePacketData.java
core/java/android/net/NattKeepalivePacketData.java [new file with mode: 0644]
core/java/android/net/NetworkAgent.java
core/java/android/net/SocketKeepalive.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
tests/net/java/com/android/server/ConnectivityServiceTest.java