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

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

Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a5 am: 453ce239 am: 63c911b9 

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

Change-Id: Ie524806023ddceb4481831a05a4750112f4be1b7
parents 08e521f0 63c911b9

core/api/module-lib-current.txt

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

  }

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

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public final class IpSecManager { 
     *

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int DIRECTION_FWD = 2;



    /**