summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2014-04-24 22:45:05 -0700
committer Colin Cross <ccross@android.com> 2014-04-24 22:45:05 -0700
commitc955677c1b2e03ad048e034bd033dd66dfd72ef3 (patch)
treeda637f24b33cd4e10015eb78d8c27c48fea834ce
parent3ce4bd3e715bd10e35bbc88204653c19b3b91f44 (diff)
fix build
When commit 4e48f40b0384110082bec52caf38d2d47ce505f5 merged from AOSP it added a hunk that was already present. Remove the second copy. Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
-rw-r--r--core/java/android/webkit/WebViewClient.java24
1 files changed, 0 insertions, 24 deletions
diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java
index 789156f74a2d..688c2518bf67 100644
--- a/core/java/android/webkit/WebViewClient.java
+++ b/core/java/android/webkit/WebViewClient.java
@@ -206,30 +206,6 @@ public class WebViewClient {
handler.cancel();
}
- /**
- * 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 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.
- *
- * The default behavior is to cancel, returning no client certificate.
- *
- * @param view The WebView that is initiating the callback
- * @param request An instance of a {@link ClientCertRequest}
- *
- * TODO(sgurun) unhide
- * @hide
- */
- public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {
- request.cancel();
- }
-
/**
* Notify the host application to handle a SSL client certificate
* request. The host application is responsible for showing the UI