From 4ead33300f315db070503308960299173a7336ed Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Sat, 20 Jun 2015 05:21:38 +0000 Subject: Revert "Clarify handling client certificates" CL broke the javadoc build. This reverts commit 36cf701e1ef0e24ce865734babb526ef5e4dc9b4. Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8 --- core/java/android/webkit/WebViewClient.java | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 7db88af5f71e..2f5c9e2d2d45 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -298,27 +298,14 @@ public class WebViewClient { * Notify the host application to handle a SSL client certificate * request. The host application is responsible for showing the UI * if desired and providing the keys. There are three ways to - * respond: proceed(), cancel() or ignore(). Webview stores the response - * in memory (for the life of the application) if proceed() or cancel() is - * called and does not call onReceivedClientCertRequest() again for the - * same host and port pair. Webview does not store the response if ignore() - * is called. + * respond: proceed(), cancel() or ignore(). Webview remembers the + * response if proceed() or cancel() is called and does not + * call onReceivedClientCertRequest() again for the same host and port + * pair. Webview does not remember the response if ignore() is called. * * This method is called on the UI thread. During the callback, the * connection is suspended. * - * For most use cases, the application program should implement the - * {@link android.security.KeyChainAliasCallback} interface and pass it to - * {@link android.security.KeyChain.choosePrivateKeyAlias} to start an - * activity for the user to choose the proper alias. The keychain activity will - * provide the alias through the callback method in the implemented interface. Next - * the application should create an async task to call - * {@link android.security.KeyChain.getPrivateKey} to receive the key. - * - * An example implementation of client certificates can be seen at - * - * AOSP Browser - * * The default behavior is to cancel, returning no client certificate. * * @param view The WebView that is initiating the callback -- cgit v1.2.3-59-g8ed1b