Loading Android.bp +0 −1 Original line number Diff line number Diff line Loading @@ -419,7 +419,6 @@ filegroup { name: "framework-ike-shared-srcs", visibility: ["//packages/modules/IPsec"], srcs: [ "core/java/android/net/annotations/PolicyDirection.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/WakeupMessage.java", "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", Loading core/java/android/net/annotations/PolicyDirection.java +0 −4 Original line number Diff line number Diff line Loading @@ -24,10 +24,6 @@ import java.lang.annotation.RetentionPolicy; /** * 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 */ @IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT}) Loading packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java +8 −1 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading @@ -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; Loading Loading @@ -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. * Loading Loading
Android.bp +0 −1 Original line number Diff line number Diff line Loading @@ -419,7 +419,6 @@ filegroup { name: "framework-ike-shared-srcs", visibility: ["//packages/modules/IPsec"], srcs: [ "core/java/android/net/annotations/PolicyDirection.java", "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/WakeupMessage.java", "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java", Loading
core/java/android/net/annotations/PolicyDirection.java +0 −4 Original line number Diff line number Diff line Loading @@ -24,10 +24,6 @@ import java.lang.annotation.RetentionPolicy; /** * 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 */ @IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT}) Loading
packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java +8 −1 Original line number Diff line number Diff line Loading @@ -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; Loading @@ -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; Loading @@ -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; Loading Loading @@ -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. * Loading