diff options
| author | 2018-11-12 02:44:45 -0800 | |
|---|---|---|
| committer | 2018-11-12 02:44:45 -0800 | |
| commit | 6be456480508ac836f650fa1d95be03dd16c76c1 (patch) | |
| tree | 7034374d2c279d41a689d4b372bc48924a087933 | |
| parent | 2f8c8439a501588b42b24ebdc37c190cd59178f9 (diff) | |
| parent | 5f9193bdad53237a380fbf53a23aca7f3d5c8924 (diff) | |
Merge "Add Conscrypt Public API"
am: 5f9193bdad
Change-Id: I240d6c613dc8aab01ae387a7a3cde85fba08c51a
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | api/current.txt | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 48391fc5e4aa..170e22e1cbde 100644 --- a/Android.bp +++ b/Android.bp @@ -1154,6 +1154,7 @@ stubs_defaults { ":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 @@ stubs_defaults { ":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, diff --git a/api/current.txt b/api/current.txt index c5fbe605d5ab..4654c0100d7f 100755 --- a/api/current.txt +++ b/api/current.txt @@ -28224,6 +28224,20 @@ package android.net.sip { } +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 { |