Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 5f70655025
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928465 Change-Id: I2c3718d48073e2c07d269169effe90958c6f4a47
This commit is contained in:
@@ -17,6 +17,7 @@ package android.net;
|
||||
|
||||
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
|
||||
|
||||
import android.annotation.IntDef;
|
||||
import android.annotation.NonNull;
|
||||
import android.annotation.RequiresFeature;
|
||||
import android.annotation.RequiresPermission;
|
||||
@@ -25,7 +26,6 @@ import android.annotation.SystemService;
|
||||
import android.annotation.TestApi;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.net.annotations.PolicyDirection;
|
||||
import android.os.Binder;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.os.RemoteException;
|
||||
@@ -41,6 +41,8 @@ import dalvik.system.CloseGuard;
|
||||
|
||||
import java.io.FileDescriptor;
|
||||
import java.io.IOException;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.net.DatagramSocket;
|
||||
import java.net.InetAddress;
|
||||
import java.net.Socket;
|
||||
@@ -88,6 +90,11 @@ public final class IpSecManager {
|
||||
@SystemApi(client = MODULE_LIBRARIES)
|
||||
public static final int DIRECTION_FWD = 2;
|
||||
|
||||
/** @hide */
|
||||
@IntDef(value = {DIRECTION_IN, DIRECTION_OUT})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface PolicyDirection {}
|
||||
|
||||
/**
|
||||
* The Security Parameter Index (SPI) 0 indicates an unknown or invalid index.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user