Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PolicyDirection InfDef annotation to IpSecManager"

Browse Source
This commit is contained in:
Aaron Huang
2022-01-15 06:08:32 +00:00
committed by Gerrit Code Review
parent 91b96e3454 314e2b37f2
commit 3498c7a5cc
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -419,7 +419,6 @@ filegroup {
name: "framework-ike-shared-srcs", name: "framework-ike-shared-srcs",
visibility: ["//packages/modules/IPsec"], visibility: ["//packages/modules/IPsec"],
srcs: [ srcs: [
"core/java/android/net/annotations/PolicyDirection.java",
"core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/HexDump.java",
"core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/WakeupMessage.java",
"services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java",

4
core/java/android/net/annotations/PolicyDirection.java
View File

@@ -24,10 +24,6 @@ import java.lang.annotation.RetentionPolicy;
/** /**
* IPsec traffic direction. * IPsec traffic direction.
*
* <p>Mainline modules cannot reference hidden @IntDef. Moving this annotation to a separate class
* to allow others to statically include it.
*
* @hide * @hide
*/ */
@IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT}) @IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT})

9
packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java
View File

@@ -17,6 +17,7 @@ package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.RequiresFeature; import android.annotation.RequiresFeature;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
@@ -25,7 +26,6 @@ import android.annotation.SystemService;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.annotations.PolicyDirection;
import android.os.Binder; import android.os.Binder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
@@ -41,6 +41,8 @@ import dalvik.system.CloseGuard;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
@@ -88,6 +90,11 @@ public final class IpSecManager {
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
public static final int DIRECTION_FWD = 2; 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. * The Security Parameter Index (SPI) 0 indicates an unknown or invalid index.
* *