OSDN Git Service

Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e...
authorJunyu Lai <junyulai@google.com>
Mon, 25 Mar 2019 11:16:18 +0000 (04:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Mar 2019 11:16:18 +0000 (04:16 -0700)
commit356c5dfd420331434e893f852ee3ac3f307a3c40
tree1f0600c63e3c363fae2b351495b89903f781ed6f
parent230904927ea921c80b73c34f71df0ffeb93f1110
parentd24f3fc8b1ba709ff983f27e026c5f3fa9b52fa4
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7e5 am: 08e1787088
am: d24f3fc8b1

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be
api/current.txt
api/system-current.txt
core/java/android/net/NetworkAgent.java
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java