[FP5-2743] mainline_t_2023_nov_t1008511
Change-Id: I0e0b3ce37884f0ab8cdaf7b8897871e85ebb3829
(cherry picked from commit 3f9d7236efd0c70185e1ee0d289b607fa4d42089)
diff --git a/current/Android.bp b/current/Android.bp
old mode 100644
new mode 100755
diff --git a/current/arm/lib/libconscrypt_jni.so b/current/arm/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index b459839..949013a
--- 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 100644
new mode 100755
index ba908da..159936d
--- a/current/arm64/lib/libconscrypt_jni.so
+++ b/current/arm64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt b/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
old mode 100644
new mode 100755
index 6f30d9a..6ea0dca
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -108,6 +108,6 @@
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,154,5,154,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,330,5,330,51,
-Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,138,5,138,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,512,5,512,51,
+Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,159,5,159,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,533,5,533,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/metadata.csv b/current/hiddenapi/metadata.csv
old mode 100644
new mode 100755
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
old mode 100644
new mode 100755
diff --git a/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar b/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar
old mode 100644
new mode 100755
diff --git a/current/licenses/external/conscrypt/LICENSE b/current/licenses/external/conscrypt/LICENSE
old mode 100644
new mode 100755
diff --git a/current/licenses/external/conscrypt/NOTICE b/current/licenses/external/conscrypt/NOTICE
old mode 100644
new mode 100755
diff --git a/current/licenses/external/conscrypt/licenses/LICENSE.harmony.txt b/current/licenses/external/conscrypt/licenses/LICENSE.harmony.txt
old mode 100644
new mode 100755
diff --git a/current/licenses/external/conscrypt/licenses/LICENSE.netty.txt b/current/licenses/external/conscrypt/licenses/LICENSE.netty.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/conscrypt-removed.txt b/current/sdk_library/module-lib/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/conscrypt-stubs.jar b/current/sdk_library/module-lib/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/module-lib/conscrypt.srcjar b/current/sdk_library/module-lib/conscrypt.srcjar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/module-lib/conscrypt.txt b/current/sdk_library/module-lib/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/module-lib/conscrypt_annotations.zip b/current/sdk_library/module-lib/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform-removed.txt b/current/sdk_library/public/conscrypt-coreplatform-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt-coreplatform-stubs.jar b/current/sdk_library/public/conscrypt-coreplatform-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform.srcjar b/current/sdk_library/public/conscrypt-coreplatform.srcjar
old mode 100644
new mode 100755
index b5d4ea7..00187a0
--- a/current/sdk_library/public/conscrypt-coreplatform.srcjar
+++ b/current/sdk_library/public/conscrypt-coreplatform.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform.txt b/current/sdk_library/public/conscrypt-coreplatform.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt-removed.txt b/current/sdk_library/public/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt-stubs.jar b/current/sdk_library/public/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.intra.core.api-removed.txt b/current/sdk_library/public/conscrypt.module.intra.core.api-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt.module.intra.core.api-stubs.jar b/current/sdk_library/public/conscrypt.module.intra.core.api-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar b/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
old mode 100644
new mode 100755
index 767de83..60651e2
--- a/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
+++ b/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.module.intra.core.api.txt b/current/sdk_library/public/conscrypt.module.intra.core.api.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt.srcjar b/current/sdk_library/public/conscrypt.srcjar
old mode 100644
new mode 100755
index d734a6f..88b85a0
--- a/current/sdk_library/public/conscrypt.srcjar
+++ b/current/sdk_library/public/conscrypt.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.txt b/current/sdk_library/public/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/public/conscrypt_annotations.zip b/current/sdk_library/public/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/system/conscrypt-removed.txt b/current/sdk_library/system/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/system/conscrypt-stubs.jar b/current/sdk_library/system/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/system/conscrypt.srcjar b/current/sdk_library/system/conscrypt.srcjar
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/sdk_library/system/conscrypt.txt b/current/sdk_library/system/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/current/sdk_library/system/conscrypt_annotations.zip b/current/sdk_library/system/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
old mode 100644
new mode 100755
index d33d0a0..a8dcbdf
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10768636
\ No newline at end of file
diff --git a/current/x86/lib/libconscrypt_jni.so b/current/x86/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index 4a6cfef..dc3b39e
--- 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 100644
new mode 100755
index cf05222..ea3b08b
--- a/current/x86_64/lib/libconscrypt_jni.so
+++ b/current/x86_64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/go/current/Android.bp b/go/current/Android.bp
old mode 100644
new mode 100755
diff --git a/go/current/arm/lib/libconscrypt_jni.so b/go/current/arm/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index b459839..949013a
--- a/go/current/arm/lib/libconscrypt_jni.so
+++ b/go/current/arm/lib/libconscrypt_jni.so
Binary files differ
diff --git a/go/current/arm64/lib/libconscrypt_jni.so b/go/current/arm64/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index ba908da..159936d
--- a/go/current/arm64/lib/libconscrypt_jni.so
+++ b/go/current/arm64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/go/current/hiddenapi/annotation-flags.csv b/go/current/hiddenapi/annotation-flags.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt b/go/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
old mode 100644
new mode 100755
index 6f30d9a..6ea0dca
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -108,6 +108,6 @@
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,154,5,154,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,330,5,330,51,
-Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,138,5,138,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,512,5,512,51,
+Lcom/android/org/conscrypt/TrustedCertificateStore;-><init>()V,external/conscrypt/repackaged/platform/src/main/java/com/android/org/conscrypt/TrustedCertificateStore.java,159,5,159,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,533,5,533,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/go/current/hiddenapi/metadata.csv b/go/current/hiddenapi/metadata.csv
old mode 100644
new mode 100755
diff --git a/go/current/hiddenapi/signature-patterns.csv b/go/current/hiddenapi/signature-patterns.csv
old mode 100644
new mode 100755
diff --git a/go/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar b/go/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar
old mode 100644
new mode 100755
diff --git a/go/current/licenses/external/conscrypt/LICENSE b/go/current/licenses/external/conscrypt/LICENSE
old mode 100644
new mode 100755
diff --git a/go/current/licenses/external/conscrypt/NOTICE b/go/current/licenses/external/conscrypt/NOTICE
old mode 100644
new mode 100755
diff --git a/go/current/licenses/external/conscrypt/licenses/LICENSE.harmony.txt b/go/current/licenses/external/conscrypt/licenses/LICENSE.harmony.txt
old mode 100644
new mode 100755
diff --git a/go/current/licenses/external/conscrypt/licenses/LICENSE.netty.txt b/go/current/licenses/external/conscrypt/licenses/LICENSE.netty.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/conscrypt-removed.txt b/go/current/sdk_library/module-lib/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/conscrypt-stubs.jar b/go/current/sdk_library/module-lib/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/module-lib/conscrypt.srcjar b/go/current/sdk_library/module-lib/conscrypt.srcjar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/module-lib/conscrypt.txt b/go/current/sdk_library/module-lib/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/module-lib/conscrypt_annotations.zip b/go/current/sdk_library/module-lib/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt-coreplatform-removed.txt b/go/current/sdk_library/public/conscrypt-coreplatform-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt-coreplatform-stubs.jar b/go/current/sdk_library/public/conscrypt-coreplatform-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt-coreplatform.srcjar b/go/current/sdk_library/public/conscrypt-coreplatform.srcjar
old mode 100644
new mode 100755
index b5d4ea7..00187a0
--- a/go/current/sdk_library/public/conscrypt-coreplatform.srcjar
+++ b/go/current/sdk_library/public/conscrypt-coreplatform.srcjar
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt-coreplatform.txt b/go/current/sdk_library/public/conscrypt-coreplatform.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt-removed.txt b/go/current/sdk_library/public/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt-stubs.jar b/go/current/sdk_library/public/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt.module.intra.core.api-removed.txt b/go/current/sdk_library/public/conscrypt.module.intra.core.api-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt.module.intra.core.api-stubs.jar b/go/current/sdk_library/public/conscrypt.module.intra.core.api-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar b/go/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
old mode 100644
new mode 100755
index 767de83..60651e2
--- a/go/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
+++ b/go/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt.module.intra.core.api.txt b/go/current/sdk_library/public/conscrypt.module.intra.core.api.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt.srcjar b/go/current/sdk_library/public/conscrypt.srcjar
old mode 100644
new mode 100755
index d734a6f..88b85a0
--- a/go/current/sdk_library/public/conscrypt.srcjar
+++ b/go/current/sdk_library/public/conscrypt.srcjar
Binary files differ
diff --git a/go/current/sdk_library/public/conscrypt.txt b/go/current/sdk_library/public/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/public/conscrypt_annotations.zip b/go/current/sdk_library/public/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/system/conscrypt-removed.txt b/go/current/sdk_library/system/conscrypt-removed.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/system/conscrypt-stubs.jar b/go/current/sdk_library/system/conscrypt-stubs.jar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/system/conscrypt.srcjar b/go/current/sdk_library/system/conscrypt.srcjar
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/sdk_library/system/conscrypt.txt b/go/current/sdk_library/system/conscrypt.txt
old mode 100644
new mode 100755
diff --git a/go/current/sdk_library/system/conscrypt_annotations.zip b/go/current/sdk_library/system/conscrypt_annotations.zip
old mode 100644
new mode 100755
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
old mode 100644
new mode 100755
index d33d0a0..a8dcbdf
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10768636
\ No newline at end of file
diff --git a/go/current/x86/lib/libconscrypt_jni.so b/go/current/x86/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index 4a6cfef..dc3b39e
--- a/go/current/x86/lib/libconscrypt_jni.so
+++ b/go/current/x86/lib/libconscrypt_jni.so
Binary files differ
diff --git a/go/current/x86_64/lib/libconscrypt_jni.so b/go/current/x86_64/lib/libconscrypt_jni.so
old mode 100644
new mode 100755
index cf05222..ea3b08b
--- a/go/current/x86_64/lib/libconscrypt_jni.so
+++ b/go/current/x86_64/lib/libconscrypt_jni.so
Binary files differ