commit f144222810c5efe6f25f7d383b582544905131cc
author Yan Yan <evitayan@google.com> Wed Feb 09 18:19:31 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 09 18:19:31 2022 +0000
tree 2c3e32fe72be0d49558541b53b397e6358395f86
parent 50363a22fbcc6b6c2c01c0cab09a54a262cdb091
parent f8063e3de6b6e233ddb6c8c30f15ad4fbb45f492

Merge "Un-finalize IpSecManager"

framework-t/api/current.txt

diff --git a/framework-t/api/current.txt b/framework-t/api/current.txt
index 2efee58..3d6fb3e 100644
--- a/framework-t/api/current.txt
+++ b/framework-t/api/current.txt
@@ -84,7 +84,7 @@
     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;

framework-t/api/module-lib-current.txt

diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt
index 5909cc9..2b3ff45 100644
--- a/framework-t/api/module-lib-current.txt
+++ b/framework-t/api/module-lib-current.txt
@@ -31,7 +31,7 @@
     method public static void registerServiceWrappers();
   }
 
-  public final class IpSecManager {
+  public class IpSecManager {
     field public static final int DIRECTION_FWD = 2; // 0x2
   }
 

framework-t/api/system-current.txt

diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index c5cb98c..492d5a5 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -326,7 +326,7 @@
 
 package android.net {
 
-  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;
   }