am 8d79e36c: Merge "Clarify handling client certificates" into mnc-dev

* commit '8d79e36c886a092bbc3d97b9c573e39021739886':
  Clarify handling client certificates
This commit is contained in:
Selim Gurun
2015-06-19 19:00:07 +00:00
committed by Android Git Automerger

View File

@@ -298,14 +298,27 @@ public class WebViewClient {
* Notify the host application to handle a SSL client certificate * Notify the host application to handle a SSL client certificate
* request. The host application is responsible for showing the UI * request. The host application is responsible for showing the UI
* if desired and providing the keys. There are three ways to * if desired and providing the keys. There are three ways to
* respond: proceed(), cancel() or ignore(). Webview remembers the * respond: proceed(), cancel() or ignore(). Webview stores the response
* response if proceed() or cancel() is called and does not * in memory (for the life of the application) if proceed() or cancel() is
* call onReceivedClientCertRequest() again for the same host and port * called and does not call onReceivedClientCertRequest() again for the
* pair. Webview does not remember the response if ignore() is called. * same host and port pair. Webview does not store the response if ignore()
* is called.
* *
* This method is called on the UI thread. During the callback, the * This method is called on the UI thread. During the callback, the
* connection is suspended. * 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
* <A href="https://android.googlesource.com/platform/packages/apps/Browser/+/android-5.1.1_r1/src/com/android/browser/Tab.java">
* AOSP Browser</a>
*
* The default behavior is to cancel, returning no client certificate. * The default behavior is to cancel, returning no client certificate.
* *
* @param view The WebView that is initiating the callback * @param view The WebView that is initiating the callback