commit 6333c84514320383c342383b9e5873028748ced9
author Adam Vartanian <flooey@google.com> Thu Oct 18 10:10:35 2018 +0100
committer Adam Vartanian <flooey@google.com> Thu Nov 08 15:22:40 2018 +0000
tree 24772bad1d20f7ca7d91ac80153dcef43cd33ea7
parent 07160ff7e5ac08e45d9fc15c61d84054b8790d3d

Add Conscrypt Public API

Bug: 110403421
Test: cts -m CtsLibcoreTestCases -t android.net.ssl
Change-Id: I51e497032e58c73cc6be77d95c3b18b139804859

Android.bp

diff --git a/Android.bp b/Android.bp
index 48391fc..170e22e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1154,6 +1154,7 @@
         ":openjdk_javadoc_files",
         ":non_openjdk_javadoc_files",
         ":android_icu4j_src_files_for_docs",
+        ":conscrypt_public_api_files",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
     ],
@@ -1214,6 +1215,7 @@
         ":openjdk_javadoc_files",
         ":non_openjdk_javadoc_files",
         ":android_icu4j_src_files_for_docs",
+        ":conscrypt_public_api_files",
     ],
     srcs_lib: "framework",
     srcs_lib_whitelist_dirs: frameworks_base_subdirs,

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 4baa8c3..08edcbc 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -28224,6 +28224,20 @@
 
 }
 
+package android.net.ssl {
+
+  public class SSLEngines {
+    method public static boolean isSupportedEngine(javax.net.ssl.SSLEngine);
+    method public static void setUseSessionTickets(javax.net.ssl.SSLEngine, boolean);
+  }
+
+  public class SSLSockets {
+    method public static boolean isSupportedSocket(javax.net.ssl.SSLSocket);
+    method public static void setUseSessionTickets(javax.net.ssl.SSLSocket, boolean);
+  }
+
+}
+
 package android.net.wifi {
 
   public class ScanResult implements android.os.Parcelable {