OSDN Git Service

Fix cannot create Nat-T keepalive on mobile data
authorjunyulai <junyulai@google.com>
Tue, 4 Jun 2019 12:26:38 +0000 (05:26 -0700)
committerjunyulai <junyulai@google.com>
Tue, 4 Jun 2019 12:44:29 +0000 (20:44 +0800)
commit931ec8efa03acfb7f8aea9769e3b04341da4fb4d
tree2a3c6041db273b90048d988008dd67739316cc29
parent02d9b9c35b5252de8e50218970b7a4fa10371583
Fix cannot create Nat-T keepalive on mobile data

Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.

This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.

Bug: 134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest android.net.cts.ConnectivityManagerTest
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests

Merged-In: If630d5b339aa722717258c721daa8ead8c431e2d
Change-Id: Ic0f168be6f5a6263a5e0565b6381dcb5c645660f
(cherry picked from commit 9ede677bb2c081ccdc41c8c3c19c949114bcc138)
core/java/android/net/NattKeepalivePacketData.java [moved from services/net/java/android/net/NattKeepalivePacketData.java with 66% similarity]
core/java/android/net/NetworkAgent.java
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
services/net/java/android/net/ip/IpClientManager.java
services/net/java/android/net/util/KeepalivePacketDataUtil.java [new file with mode: 0644]