Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39d8f01 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 4c85840b am: 5ccdd4fc 

Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
parents c6a841b7 5ccdd4fc

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -4605,6 +4605,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);

































core/java/android/net/SocketKeepalive.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -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 */