summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJunyu Lai <junyulai@google.com>2019-01-28 15:18:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-01-28 15:18:29 +0000
commitf75556a0890f157a46477f514f0aa960b362e7a6 (patch)
tree4732d19dd65085791e2db3a945ba536123754a21 /core/java
parentbf1d8ab140c6af203176c05fc9a354028eb30d58 (diff)
parent3a4675572d2113082e03cbe91fd508d34007e250 (diff)
Merge "Hide Keepalive offload API in IpSec"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/IpSecTransform.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/net/IpSecTransform.java b/core/java/android/net/IpSecTransform.java
index 23c8aa368d87..e519fdf65e50 100644
--- a/core/java/android/net/IpSecTransform.java
+++ b/core/java/android/net/IpSecTransform.java
@@ -257,7 +257,6 @@ public final class IpSecTransform implements AutoCloseable {
*
* @hide
*/
- @SystemApi
public static class NattKeepaliveCallback {
/** The specified {@code Network} is not connected. */
public static final int ERROR_INVALID_NETWORK = 1;
@@ -288,7 +287,6 @@ public final class IpSecTransform implements AutoCloseable {
*
* @hide
*/
- @SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.MANAGE_IPSEC_TUNNELS,
android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD
@@ -331,7 +329,6 @@ public final class IpSecTransform implements AutoCloseable {
*
* @hide
*/
- @SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.MANAGE_IPSEC_TUNNELS,
android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD