summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2018-08-14 11:36:55 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-14 11:36:55 -0700
commita954647f647b84f522d88c8602f9e9ec712c4325 (patch)
treea6e637474096c64fb553a74a9abd56822e06b2e2 /core/java
parent187a4a0710caa9fc42907c8df6a67ca90cc4f96b (diff)
parentb76b6c5a439f502d08ec9de32409d60c0d8f4edc (diff)
Merge "Update WebView#clearClientCertPreferences docs." into pi-dev
am: b76b6c5a43 Change-Id: I62dbbc1a69c2a2f9eadb35e399f3b50a7cee63b0
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 3452b0cc3ddf..9371342ae1a0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -41,7 +41,6 @@ import android.os.Message;
import android.os.RemoteException;
import android.os.StrictMode;
import android.print.PrintDocumentAdapter;
-import android.security.KeyChain;
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseArray;
@@ -1419,9 +1418,8 @@ public class WebView extends AbsoluteLayout
/**
* Clears the client certificate preferences stored in response
* to proceeding/cancelling client cert requests. Note that WebView
- * automatically clears these preferences when it receives a
- * {@link KeyChain#ACTION_STORAGE_CHANGED} intent. The preferences are
- * shared by all the WebViews that are created by the embedder application.
+ * automatically clears these preferences when the system keychain is updated.
+ * The preferences are shared by all the WebViews that are created by the embedder application.
*
* @param onCleared A runnable to be invoked when client certs are cleared.
* The runnable will be called in UI thread.