summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Torne (Richard Coles) <torne@google.com> 2015-03-06 14:20:00 +0000
committer Torne (Richard Coles) <torne@google.com> 2015-03-06 14:20:00 +0000
commit2b666c96e2e89c00c55e0822a131724b2e15db78 (patch)
treed9508bb4d7202b77bc5e8aac94015440ce146a75
parentcdd35e6776f1e699a507e4ebb3a19b5eb75dc0fb (diff)
Fix typo in WebSettings javadoc.
We accidentally repeated the same enum value twice; fixed to mention the three values correctly. Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
-rw-r--r--core/java/android/webkit/WebSettings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 1d2c3119d81d..3df1293578bf 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -1285,7 +1285,7 @@ public abstract class WebSettings {
* strongly discouraged.
*
* @param mode The mixed content mode to use. One of {@link #MIXED_CONTENT_NEVER_ALLOW},
- * {@link #MIXED_CONTENT_NEVER_ALLOW} or {@link #MIXED_CONTENT_COMPATIBILITY_MODE}.
+ * {@link #MIXED_CONTENT_ALWAYS_ALLOW} or {@link #MIXED_CONTENT_COMPATIBILITY_MODE}.
*/
public abstract void setMixedContentMode(int mode);
@@ -1293,7 +1293,7 @@ public abstract class WebSettings {
* Gets the current behavior of the WebView with regard to loading insecure content from a
* secure origin.
* @return The current setting, one of {@link #MIXED_CONTENT_NEVER_ALLOW},
- * {@link #MIXED_CONTENT_NEVER_ALLOW} or {@link #MIXED_CONTENT_COMPATIBILITY_MODE}.
+ * {@link #MIXED_CONTENT_ALWAYS_ALLOW} or {@link #MIXED_CONTENT_COMPATIBILITY_MODE}.
*/
public abstract int getMixedContentMode();