[FP4S-671]mainline_s_2022_aug_t1004687 Change-Id: I2935dcd4d0c396d6b0941c6ea9e1061e07a62e7f

commit: d808c6173cdd17c0ced2bf7000fca2f1dfe45968 [log] [tgz]
author: android-t1 <xiaocong.gu@t2mobile.com> Wed Oct 12 13:47:42 2022 +0800
committer: android-t1 <xiaocong.gu@t2mobile.com> Wed Oct 12 13:47:42 2022 +0800
tree: 7457d35bbe47589afc41b4e6594dc217ccc87fe9
parent: a233897cdeda5b3b888240b970ecf71175b59d11 [diff]
diff --git a/current/Android.bp b/current/Android.bp
index 04c1eae..e4da6e6 100644
--- a/current/Android.bp
+++ b/current/Android.bp

@@ -1,11 +1,6 @@
 // This is auto-generated. DO NOT EDIT.
 
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
 soong_config_module_type_import {
     from: "packages/modules/common/Android.bp",
     module_types: [
@@ -16,6 +11,12 @@
     ],
 }
 
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "conscrypt-module-sdk_com.android.conscrypt-bootclasspath-fragment@current",
     sdk_member_name: "com.android.conscrypt-bootclasspath-fragment",
@@ -23,6 +24,12 @@
     apex_available: ["com.android.conscrypt"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
     contents: ["conscrypt-module-sdk_conscrypt@current"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     api: {
         stub_libs: ["conscrypt-module-sdk_conscrypt.module.public.api@current"],
     },
@@ -31,16 +38,17 @@
     },
     hidden_api: {
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.conscrypt-bootclasspath-fragment",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -51,6 +59,12 @@
     apex_available: ["com.android.conscrypt"],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
     contents: ["conscrypt"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     api: {
         stub_libs: ["conscrypt.module.public.api"],
     },
@@ -59,10 +73,10 @@
     },
     hidden_api: {
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
@@ -80,7 +94,7 @@
         "test_com.android.conscrypt",
     ],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license@current"],
-    jars: ["java/conscrypt.jar"],
+    jars: ["java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar"],
     permitted_packages: [
         "android.net.ssl",
         "com.android.org.conscrypt",
@@ -89,6 +103,7 @@
 
 module_java_import {
     name: "conscrypt",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -105,7 +120,7 @@
         "test_com.android.conscrypt",
     ],
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
-    jars: ["java/conscrypt.jar"],
+    jars: ["java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar"],
     permitted_packages: [
         "android.net.ssl",
         "com.android.org.conscrypt",
@@ -116,6 +131,7 @@
     name: "conscrypt-module-sdk_conscrypt.module.public.api@current",
     sdk_member_name: "conscrypt.module.public.api",
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//frameworks/base",
         "//frameworks/base/api",
@@ -134,10 +150,25 @@
         removed_api: "sdk_library/public/conscrypt.module.public.api-removed.txt",
         sdk_version: "none",
     },
+    system: {
+        jars: ["sdk_library/system/conscrypt.module.public.api-stubs.jar"],
+        stub_srcs: ["sdk_library/system/conscrypt.module.public.api.srcjar"],
+        current_api: "sdk_library/system/conscrypt.module.public.api.txt",
+        removed_api: "sdk_library/system/conscrypt.module.public.api-removed.txt",
+        sdk_version: "none",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/conscrypt.module.public.api-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/conscrypt.module.public.api.srcjar"],
+        current_api: "sdk_library/module-lib/conscrypt.module.public.api.txt",
+        removed_api: "sdk_library/module-lib/conscrypt.module.public.api-removed.txt",
+        sdk_version: "none",
+    },
 }
 
 module_java_sdk_library_import {
     name: "conscrypt.module.public.api",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -145,6 +176,7 @@
         },
     },
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//frameworks/base",
         "//frameworks/base/api",
@@ -163,15 +195,30 @@
         removed_api: "sdk_library/public/conscrypt.module.public.api-removed.txt",
         sdk_version: "none",
     },
+    system: {
+        jars: ["sdk_library/system/conscrypt.module.public.api-stubs.jar"],
+        stub_srcs: ["sdk_library/system/conscrypt.module.public.api.srcjar"],
+        current_api: "sdk_library/system/conscrypt.module.public.api.txt",
+        removed_api: "sdk_library/system/conscrypt.module.public.api-removed.txt",
+        sdk_version: "none",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/conscrypt.module.public.api-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/conscrypt.module.public.api.srcjar"],
+        current_api: "sdk_library/module-lib/conscrypt.module.public.api.txt",
+        removed_api: "sdk_library/module-lib/conscrypt.module.public.api-removed.txt",
+        sdk_version: "none",
+    },
 }
 
 java_sdk_library_import {
     name: "conscrypt-module-sdk_conscrypt.module.platform.api@current",
     sdk_member_name: "conscrypt.module.platform.api",
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//external/wycheproof",
-        "//libcore:__subpackages__",
+        "//libcore/mmodules/core_platform_api",
         "//prebuilts:__subpackages__",
     ],
     apex_available: ["//apex_available:platform"],
@@ -188,6 +235,7 @@
 
 module_java_sdk_library_import {
     name: "conscrypt.module.platform.api",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -195,9 +243,10 @@
         },
     },
     visibility: [
+        "//build/soong/java/core-libraries",
         "//external/conscrypt",
         "//external/wycheproof",
-        "//libcore:__subpackages__",
+        "//libcore/mmodules/core_platform_api",
         "//prebuilts:__subpackages__",
     ],
     apex_available: ["//apex_available:platform"],
@@ -235,6 +284,7 @@
 
 module_java_sdk_library_import {
     name: "conscrypt.module.intra.core.api",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -318,6 +368,7 @@
 
 module_cc_prebuilt_library_shared {
     name: "libconscrypt_jni",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {

diff --git a/current/arm/lib/libconscrypt_jni.so b/current/arm/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index ffb863e..5e5f2b7
--- a/current/arm/lib/libconscrypt_jni.so
+++ b/current/arm/lib/libconscrypt_jni.so
Binary files differ

diff --git a/current/arm64/lib/libconscrypt_jni.so b/current/arm64/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index 1916492..ad90cb4
--- a/current/arm64/lib/libconscrypt_jni.so
+++ b/current/arm64/lib/libconscrypt_jni.so
Binary files differ

diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index fbb357a..cd22abe 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv

@@ -137,9 +137,9 @@
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->nextElement()[B,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->this$0:Lcom/android/org/conscrypt/AbstractSessionContext;,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->val$iter:Ljava/util/Iterator;,blocked
+Lcom/android/org/conscrypt/AbstractSessionContext;->-$$Nest$fgetmaximumSize(Lcom/android/org/conscrypt/AbstractSessionContext;)I,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext;-><init>(I)V,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext;->DEFAULT_SESSION_TIMEOUT_SECONDS:I,blocked
-Lcom/android/org/conscrypt/AbstractSessionContext;->access$000(Lcom/android/org/conscrypt/AbstractSessionContext;)I,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext;->cacheSession(Lcom/android/org/conscrypt/NativeSslSession;)V,blocked
 Lcom/android/org/conscrypt/AbstractSessionContext;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/AbstractSessionContext;->getIds()Ljava/util/Enumeration;,core-platform-api,public-api,sdk,system-api,test-api
@@ -324,7 +324,7 @@
 Lcom/android/org/conscrypt/Conscrypt$1;->val$verifier:Ljavax/net/ssl/HostnameVerifier;,blocked
 Lcom/android/org/conscrypt/Conscrypt$1;->verify([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z,blocked
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>()V,blocked
-Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>(Lcom/android/org/conscrypt/Conscrypt$1;)V,blocked
+Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>(Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder-IA;)V,blocked
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->build()Ljava/security/Provider;,blocked
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->defaultTlsProtocol(Ljava/lang/String;)Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;,blocked
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->defaultTlsProtocol:Ljava/lang/String;,blocked
@@ -334,7 +334,7 @@
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->provideTrustManager:Z,blocked
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->setName(Ljava/lang/String;)Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;,blocked
 Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(III)V,blocked
-Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(IIILcom/android/org/conscrypt/Conscrypt$1;)V,blocked
+Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(IIILcom/android/org/conscrypt/Conscrypt$Version-IA;)V,blocked
 Lcom/android/org/conscrypt/Conscrypt$Version;->major()I,blocked
 Lcom/android/org/conscrypt/Conscrypt$Version;->major:I,blocked
 Lcom/android/org/conscrypt/Conscrypt$Version;->minor()I,blocked
@@ -416,6 +416,8 @@
 Lcom/android/org/conscrypt/ConscryptEngine$2;-><init>(Lcom/android/org/conscrypt/ConscryptEngine;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngine$2;->provideSession()Lcom/android/org/conscrypt/ConscryptSession;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine$2;->this$0:Lcom/android/org/conscrypt/ConscryptEngine;,blocked
+Lcom/android/org/conscrypt/ConscryptEngine;->-$$Nest$mprovideHandshakeSession(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
+Lcom/android/org/conscrypt/ConscryptEngine;->-$$Nest$mprovideSession(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;Lcom/android/org/conscrypt/PeerInfoProvider;Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;)V,blocked
@@ -425,8 +427,6 @@
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_UNWRAP_OK:Ljavax/net/ssl/SSLEngineResult;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_WRAP_CLOSED:Ljavax/net/ssl/SSLEngineResult;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_WRAP_OK:Ljavax/net/ssl/SSLEngineResult;,blocked
-Lcom/android/org/conscrypt/ConscryptEngine;->access$000(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
-Lcom/android/org/conscrypt/ConscryptEngine;->access$100(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;->activeSession:Lcom/android/org/conscrypt/ActiveSession;,blocked
 Lcom/android/org/conscrypt/ConscryptEngine;->beginHandshake()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngine;->beginHandshakeInternal()V,blocked
@@ -575,8 +575,8 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;->$SwitchMap$javax$net$ssl$SSLEngineResult$HandshakeStatus:[I,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;->$SwitchMap$javax$net$ssl$SSLEngineResult$Status:[I,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;-><clinit>()V,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->-$$Nest$mprocessDataFromSocket(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;[BII)I,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;-><init>(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->access$100(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;[BII)I,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->allocatedBuffer:Lcom/android/org/conscrypt/AllocatedBuffer;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->available()I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->close()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -598,9 +598,9 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->singleByte:[B,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->socketInputStream:Ljava/io/InputStream;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->this$0:Lcom/android/org/conscrypt/ConscryptEngineSocket;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->-$$Nest$mflushInternal(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;)V,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->-$$Nest$mwriteInternal(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;Ljava/nio/ByteBuffer;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;-><init>(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->access$200(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;Ljava/nio/ByteBuffer;)V,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->access$300(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->flush()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->flushInternal()V,blocked
@@ -615,6 +615,15 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeInternal(Ljava/nio/ByteBuffer;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeLock:Ljava/lang/Object;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeToSocket()V,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetbufferAllocator(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/BufferAllocator;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetengine(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/ConscryptEngine;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgethandshakeLock(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetstate(Lcom/android/org/conscrypt/ConscryptEngineSocket;)I,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetstateLock(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mdoHandshake(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mgetUnderlyingInputStream(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/InputStream;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mgetUnderlyingOutputStream(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/OutputStream;,blocked
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$monHandshakeFinished(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
@@ -623,15 +632,6 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/net/InetAddress;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/net/Socket;Ljava/lang/String;IZLcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->EMPTY_BUFFER:Ljava/nio/ByteBuffer;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$000(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$1000(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$1100(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/InputStream;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$400(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/ConscryptEngine;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$500(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/OutputStream;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$600(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/BufferAllocator;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$700(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$800(Lcom/android/org/conscrypt/ConscryptEngineSocket;)I,blocked
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$900(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->bufferAllocator:Lcom/android/org/conscrypt/BufferAllocator;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->chooseClientAlias(Ljavax/net/ssl/X509KeyManager;[Ljavax/security/auth/x500/X500Principal;[Ljava/lang/String;)Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->chooseServerAlias(Ljavax/net/ssl/X509KeyManager;Ljava/lang/String;)Ljava/lang/String;,blocked
@@ -707,6 +707,11 @@
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->write(I)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->write([BII)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->writeLock:Ljava/lang/Object;,blocked
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetssl(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/NativeSsl;,blocked
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetstate(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I,blocked
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetwriteTimeoutMilliseconds(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I,blocked
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$mprovideHandshakeSession(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$mprovideSession(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/lang/String;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
@@ -714,11 +719,6 @@
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/net/InetAddress;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/net/Socket;Ljava/lang/String;IZLcom/android/org/conscrypt/SSLParametersImpl;)V,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->DBG_STATE:Z,blocked
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$000(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$100(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/NativeSsl;,blocked
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$200(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I,blocked
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$300(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I,blocked
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$400(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->activeSession:Lcom/android/org/conscrypt/ActiveSession;,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->assertReadableOrWriteableState()V,blocked
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->channelIdPrivateKey:Lcom/android/org/conscrypt/OpenSSLKey;,blocked
@@ -846,7 +846,7 @@
 Lcom/android/org/conscrypt/DefaultSSLContextImpl$TLSv12;-><init>()V,blocked
 Lcom/android/org/conscrypt/DefaultSSLContextImpl$TLSv13;-><init>()V,blocked
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;)V,blocked
-Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;Lcom/android/org/conscrypt/DefaultSSLContextImpl$1;)V,blocked
+Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;Lcom/android/org/conscrypt/DefaultSSLContextImpl-IA;)V,blocked
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->KEY_MANAGERS:[Ljavax/net/ssl/KeyManager;,blocked
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->TRUST_MANAGERS:[Ljavax/net/ssl/TrustManager;,blocked
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->engineInit([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V,core-platform-api,public-api,sdk,system-api,test-api
@@ -978,10 +978,10 @@
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->newAccessOrder()Ljava/util/Map;,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->putSessionData(Ljavax/net/ssl/SSLSession;[B)V,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->size:I,blocked
+Lcom/android/org/conscrypt/FileClientSessionCache;->-$$Nest$sfgetlogger()Ljava/util/logging/Logger;,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;-><init>()V,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;->MAX_SIZE:I,blocked
-Lcom/android/org/conscrypt/FileClientSessionCache;->access$000()Ljava/util/logging/Logger;,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;->caches:Ljava/util/Map;,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;->logger:Ljava/util/logging/Logger;,blocked
 Lcom/android/org/conscrypt/FileClientSessionCache;->reset()V,blocked
@@ -1165,7 +1165,7 @@
 Lcom/android/org/conscrypt/KeyGeneratorImpl$HmacSHA384;-><init>()V,blocked
 Lcom/android/org/conscrypt/KeyGeneratorImpl$HmacSHA512;-><init>()V,blocked
 Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;I)V,blocked
-Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/KeyGeneratorImpl$1;)V,blocked
+Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/KeyGeneratorImpl-IA;)V,blocked
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->algorithm:Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->checkKeySize(I)V,blocked
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->doKeyGeneration(I)[B,blocked
@@ -1620,17 +1620,17 @@
 Lcom/android/org/conscrypt/NativeRef;->finalize()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/NativeRef;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;)V,blocked
-Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;Lcom/android/org/conscrypt/NativeSsl$1;)V,blocked
+Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;Lcom/android/org/conscrypt/NativeSsl$BioWrapper-IA;)V,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->bio:J,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->close()V,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->getPendingWrittenBytes()I,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->readDirectByteBuffer(JI)I,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->this$0:Lcom/android/org/conscrypt/NativeSsl;,blocked
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->writeDirectByteBuffer(JI)I,blocked
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgethandshakeCallbacks(Lcom/android/org/conscrypt/NativeSsl;)Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;,blocked
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgetlock(Lcom/android/org/conscrypt/NativeSsl;)Ljava/util/concurrent/locks/ReadWriteLock;,blocked
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgetssl(Lcom/android/org/conscrypt/NativeSsl;)J,blocked
 Lcom/android/org/conscrypt/NativeSsl;-><init>(JLcom/android/org/conscrypt/SSLParametersImpl;Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;Lcom/android/org/conscrypt/SSLParametersImpl$PSKCallbacks;)V,blocked
-Lcom/android/org/conscrypt/NativeSsl;->access$100(Lcom/android/org/conscrypt/NativeSsl;)J,blocked
-Lcom/android/org/conscrypt/NativeSsl;->access$200(Lcom/android/org/conscrypt/NativeSsl;)Ljava/util/concurrent/locks/ReadWriteLock;,blocked
-Lcom/android/org/conscrypt/NativeSsl;->access$300(Lcom/android/org/conscrypt/NativeSsl;)Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;,blocked
 Lcom/android/org/conscrypt/NativeSsl;->aliasChooser:Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;,blocked
 Lcom/android/org/conscrypt/NativeSsl;->chooseClientCertificate([B[I[[B)V,blocked
 Lcom/android/org/conscrypt/NativeSsl;->clientPSKKeyRequested(Ljava/lang/String;[B[B)I,blocked
@@ -1709,9 +1709,9 @@
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->putValue(Ljava/lang/String;Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->removeValue(Ljava/lang/String;)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->this$0:Lcom/android/org/conscrypt/NativeSslSession$Impl;,blocked
+Lcom/android/org/conscrypt/NativeSslSession$Impl;->-$$Nest$mgetCreationTime(Lcom/android/org/conscrypt/NativeSslSession$Impl;)J,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[B)V,blocked
-Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[BLcom/android/org/conscrypt/NativeSslSession$1;)V,blocked
-Lcom/android/org/conscrypt/NativeSslSession$Impl;->access$300(Lcom/android/org/conscrypt/NativeSslSession$Impl;)J,blocked
+Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[BLcom/android/org/conscrypt/NativeSslSession$Impl-IA;)V,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->cipherSuite:Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->context:Lcom/android/org/conscrypt/AbstractSessionContext;,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->getCipherSuite()Ljava/lang/String;,blocked
@@ -1734,10 +1734,10 @@
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->ref:Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->toBytes()[B,blocked
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->toSSLSession()Ljavax/net/ssl/SSLSession;,blocked
+Lcom/android/org/conscrypt/NativeSslSession;->-$$Nest$sfgetlogger()Ljava/util/logging/Logger;,blocked
+Lcom/android/org/conscrypt/NativeSslSession;->-$$Nest$smlog(Ljava/lang/Throwable;)V,blocked
 Lcom/android/org/conscrypt/NativeSslSession;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/NativeSslSession;-><init>()V,blocked
-Lcom/android/org/conscrypt/NativeSslSession;->access$100()Ljava/util/logging/Logger;,blocked
-Lcom/android/org/conscrypt/NativeSslSession;->access$200(Ljava/lang/Throwable;)V,blocked
 Lcom/android/org/conscrypt/NativeSslSession;->checkRemaining(Ljava/nio/ByteBuffer;I)V,blocked
 Lcom/android/org/conscrypt/NativeSslSession;->getCipherSuite()Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/NativeSslSession;->getId()[B,blocked
@@ -2236,7 +2236,7 @@
 Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA384;-><init>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA512;-><init>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLMac;-><init>(I)V,blocked
-Lcom/android/org/conscrypt/OpenSSLMac;-><init>(ILcom/android/org/conscrypt/OpenSSLMac$1;)V,blocked
+Lcom/android/org/conscrypt/OpenSSLMac;-><init>(ILcom/android/org/conscrypt/OpenSSLMac-IA;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLMac;->doFinal()[B,blocked
 Lcom/android/org/conscrypt/OpenSSLMac;->engineDoFinal()[B,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/OpenSSLMac;->engineGetMacLength()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -2257,7 +2257,7 @@
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA512;-><init>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JI)V,blocked
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;Z)V,blocked
-Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/OpenSSLMessageDigestJDK$1;)V,blocked
+Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/OpenSSLMessageDigestJDK-IA;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->clone()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->ctx:Lcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;,blocked
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->digestInitializedInContext:Z,blocked
@@ -2427,7 +2427,7 @@
 Lcom/android/org/conscrypt/OpenSSLSignature$SHA512RSA;-><init>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLSignature$SHA512RSAPSS;-><init>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;)V,blocked
-Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;Lcom/android/org/conscrypt/OpenSSLSignature$1;)V,blocked
+Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;Lcom/android/org/conscrypt/OpenSSLSignature-IA;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLSignature;->checkEngineType(Lcom/android/org/conscrypt/OpenSSLKey;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLSignature;->configureEVP_PKEY_CTX(J)V,blocked
 Lcom/android/org/conscrypt/OpenSSLSignature;->ctx:Lcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;,blocked
@@ -2630,11 +2630,11 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$1;->$SwitchMap$com$android$org$conscrypt$OpenSSLX509CertPath$Encoding:[I,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$1;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->$VALUES:[Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;,blocked
+Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->-$$Nest$fgetapiName(Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;)Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;-><init>(Ljava/lang/String;ILjava/lang/String;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->PKCS7:Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->PKI_PATH:Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;,blocked
-Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->access$000(Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;)Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->apiName:Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->findByApiName(Ljava/lang/String;)Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->valueOf(Ljava/lang/String;)Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;,blocked
@@ -2729,7 +2729,7 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$2;->fromX509PemInputStream(Ljava/io/InputStream;)Ljava/lang/Object;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$2;->this$0:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>()V,lo-prio,max-target-o
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>(Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$1;)V,blocked
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>(Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser-IA;)V,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromPkcs7DerInputStream(Ljava/io/InputStream;)Ljava/util/List;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromPkcs7PemInputStream(Ljava/io/InputStream;)Ljava/util/List;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromX509DerInputStream(Ljava/io/InputStream;)Ljava/lang/Object;,lo-prio,max-target-o
@@ -2740,12 +2740,12 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;-><init>(Ljava/lang/String;)V,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;-><init>(Ljava/lang/String;Ljava/lang/Exception;)V,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;->serialVersionUID:J,sdk
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->-$$Nest$sfgetPKCS7_MARKER()[B,blocked
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->-$$Nest$smisMaybePkcs7([B)Z,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;-><init>()V,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->PKCS7_MARKER:[B,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->PUSHBACK_SIZE:I,lo-prio,max-target-o
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->access$000()[B,blocked
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->access$100([B)Z,blocked
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->certificateParser:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->crlParser:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->engineGenerateCRL(Ljava/io/InputStream;)Ljava/security/cert/CRL;,core-platform-api,public-api,sdk,system-api,test-api
@@ -2824,7 +2824,7 @@
 Lcom/android/org/conscrypt/Platform$NoPreloadHolder;-><init>()V,blocked
 Lcom/android/org/conscrypt/Platform$NoPreloadHolder;->MAPPER:Lcom/android/org/conscrypt/Platform;,blocked
 Lcom/android/org/conscrypt/Platform;-><init>()V,blocked
-Lcom/android/org/conscrypt/Platform;-><init>(Lcom/android/org/conscrypt/Platform$1;)V,blocked
+Lcom/android/org/conscrypt/Platform;-><init>(Lcom/android/org/conscrypt/Platform-IA;)V,blocked
 Lcom/android/org/conscrypt/Platform;->blockGuardOnNetwork()V,blocked
 Lcom/android/org/conscrypt/Platform;->checkClientTrusted(Ljavax/net/ssl/X509TrustManager;[Ljava/security/cert/X509Certificate;Ljava/lang/String;Lcom/android/org/conscrypt/AbstractConscryptSocket;)V,blocked
 Lcom/android/org/conscrypt/Platform;->checkClientTrusted(Ljavax/net/ssl/X509TrustManager;[Ljava/security/cert/X509Certificate;Ljava/lang/String;Lcom/android/org/conscrypt/ConscryptEngine;)V,blocked
@@ -2898,7 +2898,7 @@
 Lcom/android/org/conscrypt/SSLNullSession$DefaultHolder;-><init>()V,blocked
 Lcom/android/org/conscrypt/SSLNullSession$DefaultHolder;->NULL_SESSION:Lcom/android/org/conscrypt/SSLNullSession;,blocked
 Lcom/android/org/conscrypt/SSLNullSession;-><init>()V,blocked
-Lcom/android/org/conscrypt/SSLNullSession;-><init>(Lcom/android/org/conscrypt/SSLNullSession$1;)V,blocked
+Lcom/android/org/conscrypt/SSLNullSession;-><init>(Lcom/android/org/conscrypt/SSLNullSession-IA;)V,blocked
 Lcom/android/org/conscrypt/SSLNullSession;->INVALID_CIPHER:Ljava/lang/String;,blocked
 Lcom/android/org/conscrypt/SSLNullSession;->creationTime:J,blocked
 Lcom/android/org/conscrypt/SSLNullSession;->getApplicationBufferSize()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -3124,7 +3124,7 @@
 Lcom/android/org/conscrypt/TrustManagerFactoryImpl;->keyStore:Ljava/security/KeyStore;,blocked
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;)V,lo-prio,max-target-o
-Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;Lcom/android/org/conscrypt/TrustManagerImpl$1;)V,blocked
+Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker-IA;)V,blocked
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_OID:Ljava/lang/String;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_anyExtendedKeyUsage:Ljava/lang/String;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_clientAuth:Ljava/lang/String;,lo-prio,max-target-o
@@ -3140,7 +3140,7 @@
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->leaf:Ljava/security/cert/X509Certificate;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>()V,lo-prio,max-target-o
-Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>(Lcom/android/org/conscrypt/TrustManagerImpl$1;)V,blocked
+Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>(Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator-IA;)V,blocked
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->CERT_COMPARATOR:Lcom/android/org/conscrypt/CertificatePriorityComparator;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->compare(Ljava/security/cert/TrustAnchor;Ljava/security/cert/TrustAnchor;)I,lo-prio,max-target-o
@@ -3254,23 +3254,23 @@
 Lcom/android/org/conscrypt/TrustedCertificateStore$5;->this$0:Lcom/android/org/conscrypt/TrustedCertificateStore;,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore$5;->val$c:Ljava/security/cert/X509Certificate;,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore$CertSelector;->match(Ljava/security/cert/X509Certificate;)Z,lo-prio,max-target-o
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsAddedDir()Ljava/io/File;,blocked
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsDeletedDir()Ljava/io/File;,blocked
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsSystemDir()Ljava/io/File;,blocked
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfputdefaultCaCertsAddedDir(Ljava/io/File;)V,blocked
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfputdefaultCaCertsDeletedDir(Ljava/io/File;)V,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;-><init>()V,lo-prio,max-target-o
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$000()Ljava/io/File;,blocked
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$002(Ljava/io/File;)Ljava/io/File;,blocked
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$100()Ljava/io/File;,blocked
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$102(Ljava/io/File;)Ljava/io/File;,blocked
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$200()Ljava/io/File;,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsAddedDir:Ljava/io/File;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsDeletedDir:Ljava/io/File;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsSystemDir:Ljava/io/File;,lo-prio,max-target-o
+Lcom/android/org/conscrypt/TrustedCertificateStore;->-$$Nest$misDeletedSystemCertificate(Lcom/android/org/conscrypt/TrustedCertificateStore;Ljava/security/cert/X509Certificate;)Z,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,core-platform-api,unsupported
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>(Ljava/io/File;Ljava/io/File;Ljava/io/File;)V,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore;->CERT_FACTORY:Ljava/security/cert/CertificateFactory;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore;->PREFIX_SYSTEM:Ljava/lang/String;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore;->PREFIX_USER:Ljava/lang/String;,lo-prio,max-target-o
-Lcom/android/org/conscrypt/TrustedCertificateStore;->access$300(Lcom/android/org/conscrypt/TrustedCertificateStore;Ljava/security/cert/X509Certificate;)Z,blocked
 Lcom/android/org/conscrypt/TrustedCertificateStore;->addAliases(Ljava/util/Set;Ljava/lang/String;Ljava/io/File;)V,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore;->addedDir:Ljava/io/File;,lo-prio,max-target-o
 Lcom/android/org/conscrypt/TrustedCertificateStore;->aliases()Ljava/util/Set;,core-platform-api,lo-prio,max-target-o
@@ -3586,7 +3586,7 @@
 Lcom/android/org/conscrypt/metrics/Protocol;->values()[Lcom/android/org/conscrypt/metrics/Protocol;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>()V,blocked
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>(Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$1;)V,blocked
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>(Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder-IA;)V,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->build()Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->build:Lcom/android/org/conscrypt/metrics/OptionalMethod;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->builder:Ljava/lang/Object;,blocked
@@ -3600,10 +3600,10 @@
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeBoolean:Lcom/android/org/conscrypt/metrics/OptionalMethod;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeInt(I)Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeInt:Lcom/android/org/conscrypt/metrics/OptionalMethod;,blocked
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->-$$Nest$sfgetnewBuilder()Lcom/android/org/conscrypt/metrics/OptionalMethod;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><clinit>()V,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;)V,blocked
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$1;)V,blocked
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->access$100()Lcom/android/org/conscrypt/metrics/OptionalMethod;,blocked
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent-IA;)V,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->buildEvent(IZIII)Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->c_statsEvent:Ljava/lang/Class;,blocked
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->getStatsEvent()Ljava/lang/Object;,blocked

diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 11f00ed..52e88fd 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv

@@ -16,14 +16,14 @@
 Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/AbstractConscryptSocket.java,732,5,735,108,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
 Lcom/android/org/conscrypt/AbstractConscryptSocket;->setApplicationProtocols([Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/AbstractConscryptSocket.java,744,5,747,108,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
 Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocols()[Ljava/lang/String;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/AbstractConscryptSocket.java,754,5,757,90,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23getApplicationProtocols%28%29%7D.%22
-Lcom/android/org/conscrypt/ClientSessionContext;->setPersistentCache(Lcom/android/org/conscrypt/SSLClientSessionCache;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java,55,5,56,33,
-Lcom/android/org/conscrypt/ClientSessionContext;->getSession(Ljava/lang/String;I)Lcom/android/org/conscrypt/NativeSslSession;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java,123,5,123,51,
+Lcom/android/org/conscrypt/ClientSessionContext;->setPersistentCache(Lcom/android/org/conscrypt/SSLClientSessionCache;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java,55,5,55,51,
+Lcom/android/org/conscrypt/ClientSessionContext;->getSession(Ljava/lang/String;I)Lcom/android/org/conscrypt/NativeSslSession;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ClientSessionContext.java,122,5,122,51,
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->setHostname(Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java,380,5,382,92,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setServerNames%7D.%22
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->setUseSessionTickets(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptEngineSocket.java,390,5,392,97,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40link+android.net.ssl.SSLSockets%23setUseSessionTickets%7D.%22
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->setUseSessionTickets(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptFileDescriptorSocket.java,788,5,790,97,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40link+android.net.ssl.SSLSockets%23setUseSessionTickets%7D.%22
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->setHostname(Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/ConscryptFileDescriptorSocket.java,803,5,805,92,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setServerNames%7D.%22
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->getSessionData(Ljava/lang/String;I)[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/FileClientSessionCache.java,134,9,134,55,
-Lcom/android/org/conscrypt/FileClientSessionCache;->usingDirectory(Ljava/io/File;)Lcom/android/org/conscrypt/SSLClientSessionCache;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/FileClientSessionCache.java,334,5,335,33,
+Lcom/android/org/conscrypt/FileClientSessionCache;->usingDirectory(Ljava/io/File;)Lcom/android/org/conscrypt/SSLClientSessionCache;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/FileClientSessionCache.java,334,5,334,51,
 Lcom/android/org/conscrypt/NativeCrypto;->EVP_PKEY_new_RSA([B[B[B[B[B[B[B[B)J,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java,90,5,90,51,
 Lcom/android/org/conscrypt/NativeCrypto;->EVP_PKEY_free(J)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java,100,5,100,51,
 Lcom/android/org/conscrypt/NativeCrypto;->RSA_generate_key_ex(I[B)J,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java,120,5,120,51,
@@ -76,29 +76,29 @@
 Lcom/android/org/conscrypt/OpenSSLContextImpl;->getPreferred()Lcom/android/org/conscrypt/OpenSSLContextImpl;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLContextImpl.java,61,5,61,51,
 Lcom/android/org/conscrypt/OpenSSLContextImpl;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLContextImpl.java,73,5,73,51,
 Lcom/android/org/conscrypt/OpenSSLKey;-><init>(J)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,48,5,48,51,
-Lcom/android/org/conscrypt/OpenSSLKey;->getNativeRef()Lcom/android/org/conscrypt/NativeRef$EVP_PKEY;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,68,5,69,33,
-Lcom/android/org/conscrypt/OpenSSLKey;->fromPrivateKey(Ljava/security/PrivateKey;)Lcom/android/org/conscrypt/OpenSSLKey;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,82,5,82,51,
-Lcom/android/org/conscrypt/OpenSSLKey;->getPublicKey()Ljava/security/PublicKey;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,285,5,285,51,
+Lcom/android/org/conscrypt/OpenSSLKey;->getNativeRef()Lcom/android/org/conscrypt/NativeRef$EVP_PKEY;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,68,5,68,51,
+Lcom/android/org/conscrypt/OpenSSLKey;->fromPrivateKey(Ljava/security/PrivateKey;)Lcom/android/org/conscrypt/OpenSSLKey;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,81,5,81,51,
+Lcom/android/org/conscrypt/OpenSSLKey;->getPublicKey()Ljava/security/PublicKey;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKey.java,284,5,284,51,
 Lcom/android/org/conscrypt/OpenSSLKeyHolder;->getOpenSSLKey()Lcom/android/org/conscrypt/OpenSSLKey;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLKeyHolder.java,26,5,26,51,
-Lcom/android/org/conscrypt/OpenSSLProvider;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java,53,5,54,33,
-Lcom/android/org/conscrypt/OpenSSLRandom;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLRandom.java,32,5,33,33,
+Lcom/android/org/conscrypt/OpenSSLProvider;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java,52,5,52,51,
+Lcom/android/org/conscrypt/OpenSSLRandom;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLRandom.java,32,5,32,51,
 Lcom/android/org/conscrypt/OpenSSLSocketFactoryImpl;->sslParameters:Lcom/android/org/conscrypt/SSLParametersImpl;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketFactoryImpl.java,41,5,41,51,
 Lcom/android/org/conscrypt/OpenSSLSocketFactoryImpl;-><init>()V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketFactoryImpl.java,45,5,45,51,
 Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,64,5,64,95,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHostname(Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,70,5,72,100,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setServerNames%7D.%22
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHostname(Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,70,5,72,92,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setServerNames%7D.%22
 Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostnameOrIP()Ljava/lang/String;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,80,5,80,95,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setSoWriteTimeout(I)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,91,5,92,77,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getSoWriteTimeout()I,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,99,5,99,95,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHandshakeTimeout(I)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,105,5,106,77,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setUseSessionTickets(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,117,5,120,92,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40link+android.net.ssl.SSLSockets%23setUseSessionTickets%7D.%22
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdEnabled(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,126,5,126,95,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,130,5,130,95,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,134,5,135,79,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getNpnSelectedProtocol()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,143,5,144,33,
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setNpnProtocols([B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,155,5,156,33,
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,167,5,170,108,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,181,5,184,93,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLSocket%23getApplicationProtocol%28%29%7D.%22
-Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,195,5,198,116,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setSoWriteTimeout(I)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,91,5,91,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getSoWriteTimeout()I,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,98,5,98,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHandshakeTimeout(I)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,104,5,104,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setUseSessionTickets(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,114,5,116,97,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40link+android.net.ssl.SSLSockets%23setUseSessionTickets%7D.%22
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdEnabled(Z)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,122,5,122,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,126,5,126,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,130,5,130,95,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getNpnSelectedProtocol()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,138,5,138,51,
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setNpnProtocols([B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,149,5,149,51,
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,160,5,163,108,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,174,5,176,98,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLSocket%23getApplicationProtocol%28%29%7D.%22
+Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLSocketImpl.java,187,5,190,108,maxTargetSdk=29&publicAlternatives=%22Use+%7B%40code+javax.net.ssl.SSLParameters%23setApplicationProtocols%28java.lang.String%5B%5D%29%7D.%22
 Lcom/android/org/conscrypt/OpenSSLX509Certificate;->mContext:J,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLX509Certificate.java,63,5,63,51,
 Lcom/android/org/conscrypt/OpenSSLX509Certificate;->fromX509PemInputStream(Ljava/io/InputStream;)Lcom/android/org/conscrypt/OpenSSLX509Certificate;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLX509Certificate.java,148,5,148,51,
 Lcom/android/org/conscrypt/SSLParametersImpl;->x509TrustManager:Ljavax/net/ssl/X509TrustManager;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/SSLParametersImpl.java,72,5,72,51,
@@ -106,8 +106,8 @@
 Lcom/android/org/conscrypt/SSLParametersImpl;->getX509TrustManager()Ljavax/net/ssl/X509TrustManager;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/SSLParametersImpl.java,244,5,244,95,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/org/conscrypt/SSLParametersImpl;->setEnabledProtocols([Ljava/lang/String;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/SSLParametersImpl.java,283,5,283,95,maxTargetSdk=30&trackingBug=170729553L
 Lcom/android/org/conscrypt/SSLParametersImpl;->getDefaultX509TrustManager()Ljavax/net/ssl/X509TrustManager;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/SSLParametersImpl.java,595,5,595,51,
-Lcom/android/org/conscrypt/TrustManagerImpl;-><init>(Ljava/security/KeyStore;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/TrustManagerImpl.java,152,5,153,33,
-Lcom/android/org/conscrypt/TrustManagerImpl;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/TrustManagerImpl.java,329,5,330,33,
-Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,130,5,131,33,
-Lcom/android/org/conscrypt/TrustedCertificateStore;->getCertificateChain(Ljava/security/cert/X509Certificate;)Ljava/util/List;,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,501,5,502,33,
+Lcom/android/org/conscrypt/TrustManagerImpl;-><init>(Ljava/security/KeyStore;)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/TrustManagerImpl.java,152,5,152,51,
+Lcom/android/org/conscrypt/TrustManagerImpl;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/TrustManagerImpl.java,328,5,328,51,
+Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,130,5,130,51,
+Lcom/android/org/conscrypt/TrustedCertificateStore;->getCertificateChain(Ljava/security/cert/X509Certificate;)Ljava/util/List;,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,500,5,500,51,
 Lcom/android/org/conscrypt/X509PublicKey;-><init>(Ljava/lang/String;[B)V,external/conscrypt/repackaged/common/src/main/java/com/android/org/conscrypt/X509PublicKey.java,34,5,34,51,

diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 0aa88f3..5d62568 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv

@@ -137,9 +137,9 @@
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->nextElement()[B
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->this$0:Lcom/android/org/conscrypt/AbstractSessionContext;
 Lcom/android/org/conscrypt/AbstractSessionContext$2;->val$iter:Ljava/util/Iterator;
+Lcom/android/org/conscrypt/AbstractSessionContext;->-$$Nest$fgetmaximumSize(Lcom/android/org/conscrypt/AbstractSessionContext;)I
 Lcom/android/org/conscrypt/AbstractSessionContext;-><init>(I)V
 Lcom/android/org/conscrypt/AbstractSessionContext;->DEFAULT_SESSION_TIMEOUT_SECONDS:I
-Lcom/android/org/conscrypt/AbstractSessionContext;->access$000(Lcom/android/org/conscrypt/AbstractSessionContext;)I
 Lcom/android/org/conscrypt/AbstractSessionContext;->cacheSession(Lcom/android/org/conscrypt/NativeSslSession;)V
 Lcom/android/org/conscrypt/AbstractSessionContext;->finalize()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/AbstractSessionContext;->getIds()Ljava/util/Enumeration;,core-platform-api,public-api,system-api,test-api
@@ -324,7 +324,7 @@
 Lcom/android/org/conscrypt/Conscrypt$1;->val$verifier:Ljavax/net/ssl/HostnameVerifier;
 Lcom/android/org/conscrypt/Conscrypt$1;->verify([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>()V
-Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>(Lcom/android/org/conscrypt/Conscrypt$1;)V
+Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;-><init>(Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder-IA;)V
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->build()Ljava/security/Provider;
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->defaultTlsProtocol(Ljava/lang/String;)Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->defaultTlsProtocol:Ljava/lang/String;
@@ -334,7 +334,7 @@
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->provideTrustManager:Z
 Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;->setName(Ljava/lang/String;)Lcom/android/org/conscrypt/Conscrypt$ProviderBuilder;
 Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(III)V
-Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(IIILcom/android/org/conscrypt/Conscrypt$1;)V
+Lcom/android/org/conscrypt/Conscrypt$Version;-><init>(IIILcom/android/org/conscrypt/Conscrypt$Version-IA;)V
 Lcom/android/org/conscrypt/Conscrypt$Version;->major()I
 Lcom/android/org/conscrypt/Conscrypt$Version;->major:I
 Lcom/android/org/conscrypt/Conscrypt$Version;->minor()I
@@ -416,6 +416,8 @@
 Lcom/android/org/conscrypt/ConscryptEngine$2;-><init>(Lcom/android/org/conscrypt/ConscryptEngine;)V
 Lcom/android/org/conscrypt/ConscryptEngine$2;->provideSession()Lcom/android/org/conscrypt/ConscryptSession;
 Lcom/android/org/conscrypt/ConscryptEngine$2;->this$0:Lcom/android/org/conscrypt/ConscryptEngine;
+Lcom/android/org/conscrypt/ConscryptEngine;->-$$Nest$mprovideHandshakeSession(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;
+Lcom/android/org/conscrypt/ConscryptEngine;->-$$Nest$mprovideSession(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;
 Lcom/android/org/conscrypt/ConscryptEngine;-><clinit>()V
 Lcom/android/org/conscrypt/ConscryptEngine;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptEngine;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;Lcom/android/org/conscrypt/PeerInfoProvider;Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;)V
@@ -425,8 +427,6 @@
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_UNWRAP_OK:Ljavax/net/ssl/SSLEngineResult;
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_WRAP_CLOSED:Ljavax/net/ssl/SSLEngineResult;
 Lcom/android/org/conscrypt/ConscryptEngine;->NEED_WRAP_OK:Ljavax/net/ssl/SSLEngineResult;
-Lcom/android/org/conscrypt/ConscryptEngine;->access$000(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;
-Lcom/android/org/conscrypt/ConscryptEngine;->access$100(Lcom/android/org/conscrypt/ConscryptEngine;)Lcom/android/org/conscrypt/ConscryptSession;
 Lcom/android/org/conscrypt/ConscryptEngine;->activeSession:Lcom/android/org/conscrypt/ActiveSession;
 Lcom/android/org/conscrypt/ConscryptEngine;->beginHandshake()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngine;->beginHandshakeInternal()V
@@ -575,8 +575,8 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;->$SwitchMap$javax$net$ssl$SSLEngineResult$HandshakeStatus:[I
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;->$SwitchMap$javax$net$ssl$SSLEngineResult$Status:[I
 Lcom/android/org/conscrypt/ConscryptEngineSocket$3;-><clinit>()V
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->-$$Nest$mprocessDataFromSocket(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;[BII)I
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;-><init>(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->access$100(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;[BII)I
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->allocatedBuffer:Lcom/android/org/conscrypt/AllocatedBuffer;
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->available()I,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->close()V,core-platform-api,public-api,system-api,test-api
@@ -598,9 +598,9 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->singleByte:[B
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->socketInputStream:Ljava/io/InputStream;
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLInputStream;->this$0:Lcom/android/org/conscrypt/ConscryptEngineSocket;
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->-$$Nest$mflushInternal(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;)V
+Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->-$$Nest$mwriteInternal(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;Ljava/nio/ByteBuffer;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;-><init>(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->access$200(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;Ljava/nio/ByteBuffer;)V
-Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->access$300(Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->close()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->flush()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->flushInternal()V
@@ -615,6 +615,15 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeInternal(Ljava/nio/ByteBuffer;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeLock:Ljava/lang/Object;
 Lcom/android/org/conscrypt/ConscryptEngineSocket$SSLOutputStream;->writeToSocket()V
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetbufferAllocator(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/BufferAllocator;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetengine(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/ConscryptEngine;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgethandshakeLock(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetstate(Lcom/android/org/conscrypt/ConscryptEngineSocket;)I
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$fgetstateLock(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mdoHandshake(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mgetUnderlyingInputStream(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/InputStream;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$mgetUnderlyingOutputStream(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/OutputStream;
+Lcom/android/org/conscrypt/ConscryptEngineSocket;->-$$Nest$monHandshakeFinished(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><clinit>()V
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/SSLParametersImpl;)V
@@ -623,15 +632,6 @@
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/net/InetAddress;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket;-><init>(Ljava/net/Socket;Ljava/lang/String;IZLcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->EMPTY_BUFFER:Ljava/nio/ByteBuffer;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$000(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$1000(Lcom/android/org/conscrypt/ConscryptEngineSocket;)V
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$1100(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/InputStream;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$400(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/ConscryptEngine;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$500(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/io/OutputStream;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$600(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Lcom/android/org/conscrypt/BufferAllocator;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$700(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$800(Lcom/android/org/conscrypt/ConscryptEngineSocket;)I
-Lcom/android/org/conscrypt/ConscryptEngineSocket;->access$900(Lcom/android/org/conscrypt/ConscryptEngineSocket;)Ljava/lang/Object;
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->bufferAllocator:Lcom/android/org/conscrypt/BufferAllocator;
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->chooseClientAlias(Ljavax/net/ssl/X509KeyManager;[Ljavax/security/auth/x500/X500Principal;[Ljava/lang/String;)Ljava/lang/String;
 Lcom/android/org/conscrypt/ConscryptEngineSocket;->chooseServerAlias(Ljavax/net/ssl/X509KeyManager;Ljava/lang/String;)Ljava/lang/String;
@@ -707,6 +707,11 @@
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->write(I)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->write([BII)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket$SSLOutputStream;->writeLock:Ljava/lang/Object;
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetssl(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/NativeSsl;
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetstate(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$fgetwriteTimeoutMilliseconds(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$mprovideHandshakeSession(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;
+Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->-$$Nest$mprovideSession(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Lcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/lang/String;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V
@@ -714,11 +719,6 @@
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/net/InetAddress;ILjava/net/InetAddress;ILcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;-><init>(Ljava/net/Socket;Ljava/lang/String;IZLcom/android/org/conscrypt/SSLParametersImpl;)V
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->DBG_STATE:Z
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$000(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$100(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/NativeSsl;
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$200(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$300(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)I
-Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->access$400(Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;)Lcom/android/org/conscrypt/ConscryptSession;
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->activeSession:Lcom/android/org/conscrypt/ActiveSession;
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->assertReadableOrWriteableState()V
 Lcom/android/org/conscrypt/ConscryptFileDescriptorSocket;->channelIdPrivateKey:Lcom/android/org/conscrypt/OpenSSLKey;
@@ -846,7 +846,7 @@
 Lcom/android/org/conscrypt/DefaultSSLContextImpl$TLSv12;-><init>()V
 Lcom/android/org/conscrypt/DefaultSSLContextImpl$TLSv13;-><init>()V
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;)V
-Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;Lcom/android/org/conscrypt/DefaultSSLContextImpl$1;)V
+Lcom/android/org/conscrypt/DefaultSSLContextImpl;-><init>([Ljava/lang/String;Lcom/android/org/conscrypt/DefaultSSLContextImpl-IA;)V
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->KEY_MANAGERS:[Ljavax/net/ssl/KeyManager;
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->TRUST_MANAGERS:[Ljavax/net/ssl/TrustManager;
 Lcom/android/org/conscrypt/DefaultSSLContextImpl;->engineInit([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;Ljava/security/SecureRandom;)V,core-platform-api,public-api,system-api,test-api
@@ -978,10 +978,10 @@
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->newAccessOrder()Ljava/util/Map;
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->putSessionData(Ljavax/net/ssl/SSLSession;[B)V
 Lcom/android/org/conscrypt/FileClientSessionCache$Impl;->size:I
+Lcom/android/org/conscrypt/FileClientSessionCache;->-$$Nest$sfgetlogger()Ljava/util/logging/Logger;
 Lcom/android/org/conscrypt/FileClientSessionCache;-><clinit>()V
 Lcom/android/org/conscrypt/FileClientSessionCache;-><init>()V
 Lcom/android/org/conscrypt/FileClientSessionCache;->MAX_SIZE:I
-Lcom/android/org/conscrypt/FileClientSessionCache;->access$000()Ljava/util/logging/Logger;
 Lcom/android/org/conscrypt/FileClientSessionCache;->caches:Ljava/util/Map;
 Lcom/android/org/conscrypt/FileClientSessionCache;->logger:Ljava/util/logging/Logger;
 Lcom/android/org/conscrypt/FileClientSessionCache;->reset()V
@@ -1165,7 +1165,7 @@
 Lcom/android/org/conscrypt/KeyGeneratorImpl$HmacSHA384;-><init>()V
 Lcom/android/org/conscrypt/KeyGeneratorImpl$HmacSHA512;-><init>()V
 Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;I)V
-Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/KeyGeneratorImpl$1;)V
+Lcom/android/org/conscrypt/KeyGeneratorImpl;-><init>(Ljava/lang/String;ILcom/android/org/conscrypt/KeyGeneratorImpl-IA;)V
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->algorithm:Ljava/lang/String;
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->checkKeySize(I)V
 Lcom/android/org/conscrypt/KeyGeneratorImpl;->doKeyGeneration(I)[B
@@ -1620,17 +1620,17 @@
 Lcom/android/org/conscrypt/NativeRef;->finalize()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/NativeRef;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;)V
-Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;Lcom/android/org/conscrypt/NativeSsl$1;)V
+Lcom/android/org/conscrypt/NativeSsl$BioWrapper;-><init>(Lcom/android/org/conscrypt/NativeSsl;Lcom/android/org/conscrypt/NativeSsl$BioWrapper-IA;)V
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->bio:J
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->close()V
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->getPendingWrittenBytes()I
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->readDirectByteBuffer(JI)I
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->this$0:Lcom/android/org/conscrypt/NativeSsl;
 Lcom/android/org/conscrypt/NativeSsl$BioWrapper;->writeDirectByteBuffer(JI)I
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgethandshakeCallbacks(Lcom/android/org/conscrypt/NativeSsl;)Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgetlock(Lcom/android/org/conscrypt/NativeSsl;)Ljava/util/concurrent/locks/ReadWriteLock;
+Lcom/android/org/conscrypt/NativeSsl;->-$$Nest$fgetssl(Lcom/android/org/conscrypt/NativeSsl;)J
 Lcom/android/org/conscrypt/NativeSsl;-><init>(JLcom/android/org/conscrypt/SSLParametersImpl;Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;Lcom/android/org/conscrypt/SSLParametersImpl$PSKCallbacks;)V
-Lcom/android/org/conscrypt/NativeSsl;->access$100(Lcom/android/org/conscrypt/NativeSsl;)J
-Lcom/android/org/conscrypt/NativeSsl;->access$200(Lcom/android/org/conscrypt/NativeSsl;)Ljava/util/concurrent/locks/ReadWriteLock;
-Lcom/android/org/conscrypt/NativeSsl;->access$300(Lcom/android/org/conscrypt/NativeSsl;)Lcom/android/org/conscrypt/NativeCrypto$SSLHandshakeCallbacks;
 Lcom/android/org/conscrypt/NativeSsl;->aliasChooser:Lcom/android/org/conscrypt/SSLParametersImpl$AliasChooser;
 Lcom/android/org/conscrypt/NativeSsl;->chooseClientCertificate([B[I[[B)V
 Lcom/android/org/conscrypt/NativeSsl;->clientPSKKeyRequested(Ljava/lang/String;[B[B)I
@@ -1709,9 +1709,9 @@
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->putValue(Ljava/lang/String;Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->removeValue(Ljava/lang/String;)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/NativeSslSession$Impl$1;->this$0:Lcom/android/org/conscrypt/NativeSslSession$Impl;
+Lcom/android/org/conscrypt/NativeSslSession$Impl;->-$$Nest$mgetCreationTime(Lcom/android/org/conscrypt/NativeSslSession$Impl;)J
 Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[B)V
-Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[BLcom/android/org/conscrypt/NativeSslSession$1;)V
-Lcom/android/org/conscrypt/NativeSslSession$Impl;->access$300(Lcom/android/org/conscrypt/NativeSslSession$Impl;)J
+Lcom/android/org/conscrypt/NativeSslSession$Impl;-><init>(Lcom/android/org/conscrypt/AbstractSessionContext;Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;Ljava/lang/String;I[Ljava/security/cert/X509Certificate;[B[BLcom/android/org/conscrypt/NativeSslSession$Impl-IA;)V
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->cipherSuite:Ljava/lang/String;
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->context:Lcom/android/org/conscrypt/AbstractSessionContext;
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->getCipherSuite()Ljava/lang/String;
@@ -1734,10 +1734,10 @@
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->ref:Lcom/android/org/conscrypt/NativeRef$SSL_SESSION;
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->toBytes()[B
 Lcom/android/org/conscrypt/NativeSslSession$Impl;->toSSLSession()Ljavax/net/ssl/SSLSession;
+Lcom/android/org/conscrypt/NativeSslSession;->-$$Nest$sfgetlogger()Ljava/util/logging/Logger;
+Lcom/android/org/conscrypt/NativeSslSession;->-$$Nest$smlog(Ljava/lang/Throwable;)V
 Lcom/android/org/conscrypt/NativeSslSession;-><clinit>()V
 Lcom/android/org/conscrypt/NativeSslSession;-><init>()V
-Lcom/android/org/conscrypt/NativeSslSession;->access$100()Ljava/util/logging/Logger;
-Lcom/android/org/conscrypt/NativeSslSession;->access$200(Ljava/lang/Throwable;)V
 Lcom/android/org/conscrypt/NativeSslSession;->checkRemaining(Ljava/nio/ByteBuffer;I)V
 Lcom/android/org/conscrypt/NativeSslSession;->getCipherSuite()Ljava/lang/String;
 Lcom/android/org/conscrypt/NativeSslSession;->getId()[B
@@ -2236,7 +2236,7 @@
 Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA384;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLMac$HmacSHA512;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLMac;-><init>(I)V
-Lcom/android/org/conscrypt/OpenSSLMac;-><init>(ILcom/android/org/conscrypt/OpenSSLMac$1;)V
+Lcom/android/org/conscrypt/OpenSSLMac;-><init>(ILcom/android/org/conscrypt/OpenSSLMac-IA;)V
 Lcom/android/org/conscrypt/OpenSSLMac;->doFinal()[B
 Lcom/android/org/conscrypt/OpenSSLMac;->engineDoFinal()[B,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/OpenSSLMac;->engineGetMacLength()I,core-platform-api,public-api,system-api,test-api
@@ -2257,7 +2257,7 @@
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK$SHA512;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JI)V
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;Z)V
-Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/OpenSSLMessageDigestJDK$1;)V
+Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;-><init>(JILcom/android/org/conscrypt/OpenSSLMessageDigestJDK-IA;)V
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->clone()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->ctx:Lcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;
 Lcom/android/org/conscrypt/OpenSSLMessageDigestJDK;->digestInitializedInContext:Z
@@ -2427,7 +2427,7 @@
 Lcom/android/org/conscrypt/OpenSSLSignature$SHA512RSA;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLSignature$SHA512RSAPSS;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;)V
-Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;Lcom/android/org/conscrypt/OpenSSLSignature$1;)V
+Lcom/android/org/conscrypt/OpenSSLSignature;-><init>(JLcom/android/org/conscrypt/OpenSSLSignature$EngineType;Lcom/android/org/conscrypt/OpenSSLSignature-IA;)V
 Lcom/android/org/conscrypt/OpenSSLSignature;->checkEngineType(Lcom/android/org/conscrypt/OpenSSLKey;)V
 Lcom/android/org/conscrypt/OpenSSLSignature;->configureEVP_PKEY_CTX(J)V
 Lcom/android/org/conscrypt/OpenSSLSignature;->ctx:Lcom/android/org/conscrypt/NativeRef$EVP_MD_CTX;
@@ -2630,11 +2630,11 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$1;->$SwitchMap$com$android$org$conscrypt$OpenSSLX509CertPath$Encoding:[I
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$1;-><clinit>()V
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->$VALUES:[Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;
+Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->-$$Nest$fgetapiName(Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;)Ljava/lang/String;
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;-><clinit>()V
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->PKCS7:Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->PKI_PATH:Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;
-Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->access$000(Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;)Ljava/lang/String;
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->apiName:Ljava/lang/String;
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->findByApiName(Ljava/lang/String;)Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;
 Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;->valueOf(Ljava/lang/String;)Lcom/android/org/conscrypt/OpenSSLX509CertPath$Encoding;
@@ -2729,7 +2729,7 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$2;->fromX509PemInputStream(Ljava/io/InputStream;)Ljava/lang/Object;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$2;->this$0:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>()V
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>(Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$1;)V
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;-><init>(Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser-IA;)V
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromPkcs7DerInputStream(Ljava/io/InputStream;)Ljava/util/List;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromPkcs7PemInputStream(Ljava/io/InputStream;)Ljava/util/List;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;->fromX509DerInputStream(Ljava/io/InputStream;)Ljava/lang/Object;
@@ -2740,12 +2740,12 @@
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;-><init>(Ljava/lang/String;)V
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;-><init>(Ljava/lang/String;Ljava/lang/Exception;)V
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;->serialVersionUID:J
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->-$$Nest$sfgetPKCS7_MARKER()[B
+Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->-$$Nest$smisMaybePkcs7([B)Z
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;-><clinit>()V
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;-><init>()V
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->PKCS7_MARKER:[B
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->PUSHBACK_SIZE:I
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->access$000()[B
-Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->access$100([B)Z
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->certificateParser:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->crlParser:Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$Parser;
 Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory;->engineGenerateCRL(Ljava/io/InputStream;)Ljava/security/cert/CRL;,core-platform-api,public-api,system-api,test-api
@@ -2824,7 +2824,7 @@
 Lcom/android/org/conscrypt/Platform$NoPreloadHolder;-><init>()V
 Lcom/android/org/conscrypt/Platform$NoPreloadHolder;->MAPPER:Lcom/android/org/conscrypt/Platform;
 Lcom/android/org/conscrypt/Platform;-><init>()V
-Lcom/android/org/conscrypt/Platform;-><init>(Lcom/android/org/conscrypt/Platform$1;)V
+Lcom/android/org/conscrypt/Platform;-><init>(Lcom/android/org/conscrypt/Platform-IA;)V
 Lcom/android/org/conscrypt/Platform;->blockGuardOnNetwork()V
 Lcom/android/org/conscrypt/Platform;->checkClientTrusted(Ljavax/net/ssl/X509TrustManager;[Ljava/security/cert/X509Certificate;Ljava/lang/String;Lcom/android/org/conscrypt/AbstractConscryptSocket;)V
 Lcom/android/org/conscrypt/Platform;->checkClientTrusted(Ljavax/net/ssl/X509TrustManager;[Ljava/security/cert/X509Certificate;Ljava/lang/String;Lcom/android/org/conscrypt/ConscryptEngine;)V
@@ -2898,7 +2898,7 @@
 Lcom/android/org/conscrypt/SSLNullSession$DefaultHolder;-><init>()V
 Lcom/android/org/conscrypt/SSLNullSession$DefaultHolder;->NULL_SESSION:Lcom/android/org/conscrypt/SSLNullSession;
 Lcom/android/org/conscrypt/SSLNullSession;-><init>()V
-Lcom/android/org/conscrypt/SSLNullSession;-><init>(Lcom/android/org/conscrypt/SSLNullSession$1;)V
+Lcom/android/org/conscrypt/SSLNullSession;-><init>(Lcom/android/org/conscrypt/SSLNullSession-IA;)V
 Lcom/android/org/conscrypt/SSLNullSession;->INVALID_CIPHER:Ljava/lang/String;
 Lcom/android/org/conscrypt/SSLNullSession;->creationTime:J
 Lcom/android/org/conscrypt/SSLNullSession;->getApplicationBufferSize()I,core-platform-api,public-api,system-api,test-api
@@ -3124,7 +3124,7 @@
 Lcom/android/org/conscrypt/TrustManagerFactoryImpl;->keyStore:Ljava/security/KeyStore;
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><clinit>()V
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;)V
-Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;Lcom/android/org/conscrypt/TrustManagerImpl$1;)V
+Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;-><init>(ZLjava/security/cert/X509Certificate;Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker-IA;)V
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_OID:Ljava/lang/String;
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_anyExtendedKeyUsage:Ljava/lang/String;
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->EKU_clientAuth:Ljava/lang/String;
@@ -3140,7 +3140,7 @@
 Lcom/android/org/conscrypt/TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker;->leaf:Ljava/security/cert/X509Certificate;
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><clinit>()V
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>()V
-Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>(Lcom/android/org/conscrypt/TrustManagerImpl$1;)V
+Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;-><init>(Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator-IA;)V
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->CERT_COMPARATOR:Lcom/android/org/conscrypt/CertificatePriorityComparator;
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
 Lcom/android/org/conscrypt/TrustManagerImpl$TrustAnchorComparator;->compare(Ljava/security/cert/TrustAnchor;Ljava/security/cert/TrustAnchor;)I
@@ -3254,23 +3254,23 @@
 Lcom/android/org/conscrypt/TrustedCertificateStore$5;->this$0:Lcom/android/org/conscrypt/TrustedCertificateStore;
 Lcom/android/org/conscrypt/TrustedCertificateStore$5;->val$c:Ljava/security/cert/X509Certificate;
 Lcom/android/org/conscrypt/TrustedCertificateStore$CertSelector;->match(Ljava/security/cert/X509Certificate;)Z
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsAddedDir()Ljava/io/File;
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsDeletedDir()Ljava/io/File;
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfgetdefaultCaCertsSystemDir()Ljava/io/File;
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfputdefaultCaCertsAddedDir(Ljava/io/File;)V
+Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->-$$Nest$sfputdefaultCaCertsDeletedDir(Ljava/io/File;)V
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;-><clinit>()V
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;-><init>()V
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$000()Ljava/io/File;
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$002(Ljava/io/File;)Ljava/io/File;
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$100()Ljava/io/File;
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$102(Ljava/io/File;)Ljava/io/File;
-Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->access$200()Ljava/io/File;
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsAddedDir:Ljava/io/File;
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsDeletedDir:Ljava/io/File;
 Lcom/android/org/conscrypt/TrustedCertificateStore$PreloadHolder;->defaultCaCertsSystemDir:Ljava/io/File;
+Lcom/android/org/conscrypt/TrustedCertificateStore;->-$$Nest$misDeletedSystemCertificate(Lcom/android/org/conscrypt/TrustedCertificateStore;Ljava/security/cert/X509Certificate;)Z
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><clinit>()V
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,core-platform-api
 Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>(Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
 Lcom/android/org/conscrypt/TrustedCertificateStore;->CERT_FACTORY:Ljava/security/cert/CertificateFactory;
 Lcom/android/org/conscrypt/TrustedCertificateStore;->PREFIX_SYSTEM:Ljava/lang/String;
 Lcom/android/org/conscrypt/TrustedCertificateStore;->PREFIX_USER:Ljava/lang/String;
-Lcom/android/org/conscrypt/TrustedCertificateStore;->access$300(Lcom/android/org/conscrypt/TrustedCertificateStore;Ljava/security/cert/X509Certificate;)Z
 Lcom/android/org/conscrypt/TrustedCertificateStore;->addAliases(Ljava/util/Set;Ljava/lang/String;Ljava/io/File;)V
 Lcom/android/org/conscrypt/TrustedCertificateStore;->addedDir:Ljava/io/File;
 Lcom/android/org/conscrypt/TrustedCertificateStore;->aliases()Ljava/util/Set;,core-platform-api
@@ -3586,7 +3586,7 @@
 Lcom/android/org/conscrypt/metrics/Protocol;->values()[Lcom/android/org/conscrypt/metrics/Protocol;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><clinit>()V
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>()V
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>(Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$1;)V
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;-><init>(Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder-IA;)V
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->build()Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->build:Lcom/android/org/conscrypt/metrics/OptionalMethod;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->builder:Ljava/lang/Object;
@@ -3600,10 +3600,10 @@
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeBoolean:Lcom/android/org/conscrypt/metrics/OptionalMethod;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeInt(I)Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$Builder;->writeInt:Lcom/android/org/conscrypt/metrics/OptionalMethod;
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->-$$Nest$sfgetnewBuilder()Lcom/android/org/conscrypt/metrics/OptionalMethod;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><clinit>()V
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;)V
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent$1;)V
-Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->access$100()Lcom/android/org/conscrypt/metrics/OptionalMethod;
+Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;-><init>(Ljava/lang/Object;Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent-IA;)V
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->buildEvent(IZIII)Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->c_statsEvent:Ljava/lang/Class;
 Lcom/android/org/conscrypt/metrics/ReflexiveStatsEvent;->getStatsEvent()Ljava/lang/Object;

diff --git a/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar b/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar


diff --git a/current/sdk_library/module-lib/conscrypt.module.public.api-removed.txt b/current/sdk_library/module-lib/conscrypt.module.public.api-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.module.public.api-removed.txt

@@ -0,0 +1 @@
+// Signature format: 2.0

diff --git a/current/sdk_library/module-lib/conscrypt.module.public.api-stubs.jar b/current/sdk_library/module-lib/conscrypt.module.public.api-stubs.jar
new file mode 100644
index 0000000..fbb279e
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.module.public.api-stubs.jar
Binary files differ

diff --git a/current/sdk_library/module-lib/conscrypt.module.public.api.srcjar b/current/sdk_library/module-lib/conscrypt.module.public.api.srcjar
new file mode 100644
index 0000000..df1a3d0
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.module.public.api.srcjar
Binary files differ

diff --git a/current/sdk_library/module-lib/conscrypt.module.public.api.txt b/current/sdk_library/module-lib/conscrypt.module.public.api.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.module.public.api.txt

@@ -0,0 +1 @@
+// Signature format: 2.0

diff --git a/current/sdk_library/system/conscrypt.module.public.api-removed.txt b/current/sdk_library/system/conscrypt.module.public.api-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.module.public.api-removed.txt

@@ -0,0 +1 @@
+// Signature format: 2.0

diff --git a/current/sdk_library/system/conscrypt.module.public.api-stubs.jar b/current/sdk_library/system/conscrypt.module.public.api-stubs.jar
new file mode 100644
index 0000000..fbb279e
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.module.public.api-stubs.jar
Binary files differ

diff --git a/current/sdk_library/system/conscrypt.module.public.api.srcjar b/current/sdk_library/system/conscrypt.module.public.api.srcjar
new file mode 100644
index 0000000..df1a3d0
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.module.public.api.srcjar
Binary files differ

diff --git a/current/sdk_library/system/conscrypt.module.public.api.txt b/current/sdk_library/system/conscrypt.module.public.api.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.module.public.api.txt

@@ -0,0 +1 @@
+// Signature format: 2.0

diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
new file mode 100644
index 0000000..012bf4f
--- /dev/null
+++ b/current/snapshot-creation-build-number.txt

@@ -0,0 +1 @@
+8843487
\ No newline at end of file

diff --git a/current/x86/lib/libconscrypt_jni.so b/current/x86/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index 581f988..c500523
--- a/current/x86/lib/libconscrypt_jni.so
+++ b/current/x86/lib/libconscrypt_jni.so
Binary files differ

diff --git a/current/x86_64/lib/libconscrypt_jni.so b/current/x86_64/lib/libconscrypt_jni.so
old mode 100755
new mode 100644
index f76ab53..1a9e3c1
--- a/current/x86_64/lib/libconscrypt_jni.so
+++ b/current/x86_64/lib/libconscrypt_jni.so
Binary files differ
commit	d808c6173cdd17c0ced2bf7000fca2f1dfe45968	[log] [tgz]
author	android-t1 <xiaocong.gu@t2mobile.com>	Wed Oct 12 13:47:42 2022 +0800
committer	android-t1 <xiaocong.gu@t2mobile.com>	Wed Oct 12 13:47:42 2022 +0800
tree	7457d35bbe47589afc41b4e6594dc217ccc87fe9
parent	a233897cdeda5b3b888240b970ecf71175b59d11 [diff]