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

Commit 44cc9d20 authored Feb 10, 2022 by Yan Yan Committed by Automerger Merge Worker Feb 10, 2022

Merge "Un-finalize IpSecManager" am: 59f63945

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

Change-Id: I6d6ad018c285066f4720389daaf5f3e7a7feeae0

parents 1dedf4a6 59f63945

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -25254,7 +25254,7 @@ package android.net {
		field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";
		}

		public final class IpSecManager {
		public class IpSecManager {
		method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;
		method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
		method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;

core/api/module-lib-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ package android.net {
		field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;
		}

		public final class IpSecManager {
		public class IpSecManager {
		field public static final int DIRECTION_FWD = 2; // 0x2
		}

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -7054,7 +7054,7 @@ package android.net {
		field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR;
		}

		public final class IpSecManager {
		public class IpSecManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void applyTunnelModeTransform(@NonNull android.net.IpSecManager.IpSecTunnelInterface, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
		}

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1577,7 +1577,7 @@ package android.net {
		method public void setIncludeTestInterfaces(boolean);
		}

		public final class IpSecManager {
		public class IpSecManager {
		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ import java.util.Objects;
		* Internet Protocol</a>
		*/
		@SystemService(Context.IPSEC_SERVICE)
		public final class IpSecManager {
		public class IpSecManager {
		private static final String TAG = "IpSecManager";

		/**