From bd47e8cde8060074e603d4e3f260b71ac22d7479 Mon Sep 17 00:00:00 2001
From: paulhu <paulhu@google.com>
Date: Mon, 13 Jan 2020 16:18:54 +0800
Subject: [PATCH] Expose SocketKeepalive#SUCCESS as SystemApi

Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
---
 api/system-current.txt                     | 4 ++++
 core/java/android/net/SocketKeepalive.java | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index a1bb3c821b5a..0adbe85f4771 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5052,6 +5052,10 @@ package android.net {
     field public final android.net.RssiCurve rssiCurve;
   }
 
+  public abstract class SocketKeepalive implements java.lang.AutoCloseable {
+    field public static final int SUCCESS = 0; // 0x0
+  }
+
   public final class StaticIpConfiguration implements android.os.Parcelable {
     ctor public StaticIpConfiguration();
     ctor public StaticIpConfiguration(@Nullable android.net.StaticIpConfiguration);
diff --git a/core/java/android/net/SocketKeepalive.java b/core/java/android/net/SocketKeepalive.java
index fb224fbe1318..fc9a8f63c131 100644
--- a/core/java/android/net/SocketKeepalive.java
+++ b/core/java/android/net/SocketKeepalive.java
@@ -20,6 +20,7 @@ import android.annotation.IntDef;
 import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.os.Binder;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
@@ -53,7 +54,11 @@ import java.util.concurrent.Executor;
 public abstract class SocketKeepalive implements AutoCloseable {
     static final String TAG = "SocketKeepalive";
 
-    /** @hide */
+    /**
+     * No errors.
+     * @hide
+     */
+    @SystemApi
     public static final int SUCCESS = 0;
 
     /** @hide */
-- 
GitLab