Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a544 am: 453ce239aa am: 63c911b9d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928463 Change-Id: Ie524806023ddceb4481831a05a4750112f4be1b7
2021-12-21 13:48:51 +00:00
parent 08e521f02d 63c911b9d5
commit e439212deb
2 changed files with 5 additions and 0 deletions
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -202,6 +202,10 @@ package android.net {
    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;
  }

+  public final class IpSecManager {
+    field public static final int DIRECTION_FWD = 2; // 0x2
+  }
+
  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {
    method public int getResourceId();
  }
--- a/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java
@@ -86,6 +86,7 @@ public final class IpSecManager {
     *
     * @hide
     */
+    @SystemApi(client = MODULE_LIBRARIES)
    public static final int DIRECTION_FWD = 2;

    /**