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

Commit b0b2e115 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5 am: 90d6cafc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928465

Change-Id: Ic92bd41c9778bbd1bfce8598cb4b21c5b2e1e8ae
parents 62c776a7 90d6cafc

Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -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",

core/java/android/net/annotations/PolicyDirection.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -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})

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -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.

     *

     *