Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Conscrypt Public API" am: 5f9193bdad

Browse Source 
am: 6be4564805

Change-Id: Ia1d66c69d75840a007a69980cf6e0abe4d5b5a7e
This commit is contained in:
Adam Vartanian
2018-11-12 02:59:13 -08:00
committed by android-build-merger
parent 1c6f68c356 6be4564805
commit b77c9082a5
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -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,

14
api/current.txt
View File

@@ -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 {