diff options
| author | 2021-12-21 13:32:45 +0000 | |
|---|---|---|
| committer | 2021-12-21 13:32:45 +0000 | |
| commit | 63c911b9d583c3d8dc26c268c67f60dbdf698c52 (patch) | |
| tree | a125179d27ebb26152a5816e23a84e3db4596a69 | |
| parent | 5905fa1d558d1107cf854986607c7833a412732d (diff) | |
| parent | 453ce239aa301b809c9a23653a3c430ec68b5e84 (diff) | |
Merge "Make IpSecManager.DIRECTION_FWD @SystemApi" am: 644ab1a544 am: 453ce239aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928463
Change-Id: Ia0bb5e4ce32c4c4de5a84db72a4e5bb13bdc334e
| -rw-r--r-- | core/api/module-lib-current.txt | 4 | ||||
| -rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 81b4ee80a1d2..3c0eacf73341 100644 --- 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(); } diff --git a/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java index 837629911ccd..0b266b226c78 100644 --- 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; /** |