diff options
| author | Selim Gurun <sgurun@google.com> | 2014-05-02 21:34:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-02 21:34:25 +0000 |
| commit | f72382aec7af97a925b4f7228df97d83eb0ed2ba (patch) | |
| tree | 9efdc8a10413b60acafbe42c38ed45bd193bac3e /api | |
| parent | e85aef92d151440f5acfe8f0eac837f92a8e5ccc (diff) | |
| parent | f271c8ecd02c415858e0497dc586d99d9dd96de5 (diff) | |
| download | frameworks_base-f72382aec7af97a925b4f7228df97d83eb0ed2ba.zip frameworks_base-f72382aec7af97a925b4f7228df97d83eb0ed2ba.tar.gz frameworks_base-f72382aec7af97a925b4f7228df97d83eb0ed2ba.tar.bz2 | |
Merge "Unhide Client Cert APIS"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 29eda4f..9dff2f9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32693,6 +32693,16 @@ package android.view.textservice { package android.webkit { + public abstract interface ClientCertRequest { + method public abstract void cancel(); + method public abstract java.lang.String getHost(); + method public abstract java.lang.String[] getKeyTypes(); + method public abstract int getPort(); + method public abstract java.security.Principal[] getPrincipals(); + method public abstract void ignore(); + method public abstract void proceed(java.security.PrivateKey, java.security.cert.X509Certificate[]); + } + public class ConsoleMessage { ctor public ConsoleMessage(java.lang.String, java.lang.String, int, android.webkit.ConsoleMessage.MessageLevel); method public int lineNumber(); @@ -33083,6 +33093,7 @@ package android.webkit { method public deprecated boolean canZoomOut(); method public deprecated android.graphics.Picture capturePicture(); method public void clearCache(boolean); + method public static void clearClientCertPreferences(java.lang.Runnable); method public void clearFormData(); method public void clearHistory(); method public void clearMatches(); @@ -33199,6 +33210,7 @@ package android.webkit { method public void onLoadResource(android.webkit.WebView, java.lang.String); method public void onPageFinished(android.webkit.WebView, java.lang.String); method public void onPageStarted(android.webkit.WebView, java.lang.String, android.graphics.Bitmap); + method public void onReceivedClientCertRequest(android.webkit.WebView, android.webkit.ClientCertRequest); method public void onReceivedError(android.webkit.WebView, int, java.lang.String, java.lang.String); method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); |