diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-12-11 21:49:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-11 21:49:22 +0000 |
| commit | b73bb94aebec73b89f7ff429f1b2dffbea35ec98 (patch) | |
| tree | b34c831f34ffcf2cd0c0943324c0f681ac8cb5a6 /core/java/android/webkit/WebView.java | |
| parent | 68b64b2639c88568a0a826bf395995413eca4b76 (diff) | |
| parent | 75f75c18cc16334280bede33a468d44b34c56ee9 (diff) | |
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5c5e9de77916..8f03b693e587 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -42,7 +42,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; @@ -1432,9 +1431,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. |