Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c1db373 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android (Google) Code Review
Browse files

Merge "Fix typo in WebSettings javadoc."

parents eafa368a 2b666c96

core/java/android/webkit/WebSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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();