Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b77c9082 authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Merge "Add Conscrypt Public API" am: 5f9193bd 

am: 6be45648

Change-Id: Ia1d66c69d75840a007a69980cf6e0abe4d5b5a7e
parents 1c6f68c3 6be45648

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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,

api/current.txt

+14 −0
Original line number Diff line number Diff line
@@ -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 {