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

Commit a64ebd57 authored by Selim Gurun's avatar Selim Gurun Committed by android-build-merger
Browse files

Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c482 

am: e7534f48

Change-Id: I8c01b72d5f593070eebbac1f5271ca166e6abf7b
parents 5e7d2af8 e7534f48

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -48723,6 +48723,7 @@ package android.webkit { 
    method public abstract int getMixedContentMode();

    method public abstract boolean getOffscreenPreRaster();

    method public abstract deprecated android.webkit.WebSettings.PluginState getPluginState();

    method public abstract boolean getSafeBrowsingEnabled();

    method public abstract java.lang.String getSansSerifFontFamily();

    method public abstract deprecated boolean getSaveFormData();

    method public abstract deprecated boolean getSavePassword();
@@ -48772,6 +48773,7 @@ package android.webkit { 
    method public abstract void setOffscreenPreRaster(boolean);

    method public abstract deprecated void setPluginState(android.webkit.WebSettings.PluginState);

    method public abstract deprecated void setRenderPriority(android.webkit.WebSettings.RenderPriority);

    method public abstract void setSafeBrowsingEnabled(boolean);

    method public abstract void setSansSerifFontFamily(java.lang.String);

    method public abstract deprecated void setSaveFormData(boolean);

    method public abstract deprecated void setSavePassword(boolean);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -52359,6 +52359,7 @@ package android.webkit { 
    method public abstract boolean getOffscreenPreRaster();

    method public abstract deprecated android.webkit.WebSettings.PluginState getPluginState();

    method public abstract deprecated boolean getPluginsEnabled();

    method public abstract boolean getSafeBrowsingEnabled();

    method public abstract java.lang.String getSansSerifFontFamily();

    method public abstract deprecated boolean getSaveFormData();

    method public abstract deprecated boolean getSavePassword();
@@ -52414,6 +52415,7 @@ package android.webkit { 
    method public abstract deprecated void setPluginState(android.webkit.WebSettings.PluginState);

    method public abstract deprecated void setPluginsEnabled(boolean);

    method public abstract deprecated void setRenderPriority(android.webkit.WebSettings.RenderPriority);

    method public abstract void setSafeBrowsingEnabled(boolean);

    method public abstract void setSansSerifFontFamily(java.lang.String);

    method public abstract deprecated void setSaveFormData(boolean);

    method public abstract deprecated void setSavePassword(boolean);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -49122,6 +49122,7 @@ package android.webkit { 
    method public abstract int getMixedContentMode();

    method public abstract boolean getOffscreenPreRaster();

    method public abstract deprecated android.webkit.WebSettings.PluginState getPluginState();

    method public abstract boolean getSafeBrowsingEnabled();

    method public abstract java.lang.String getSansSerifFontFamily();

    method public abstract deprecated boolean getSaveFormData();

    method public abstract deprecated boolean getSavePassword();
@@ -49171,6 +49172,7 @@ package android.webkit { 
    method public abstract void setOffscreenPreRaster(boolean);

    method public abstract deprecated void setPluginState(android.webkit.WebSettings.PluginState);

    method public abstract deprecated void setRenderPriority(android.webkit.WebSettings.RenderPriority);

    method public abstract void setSafeBrowsingEnabled(boolean);

    method public abstract void setSansSerifFontFamily(java.lang.String);

    method public abstract deprecated void setSaveFormData(boolean);

    method public abstract deprecated void setSavePassword(boolean);

core/java/android/webkit/WebSettings.java

+30 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,36 @@ public abstract class WebSettings { 
     */

    public abstract boolean getOffscreenPreRaster();





    /**

     * Sets whether Safe Browsing is enabled. Safe browsing allows WebView to

     * protect against malware and phishing attacks by verifying the links.

     *

     * Safe browsing is disabled by default. The recommended way to enable

     * Safe browsing is using a manifest tag to change the default value to

     * enabled for all WebViews.

     * <p>

     * <pre>

     * &lt;meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"

     *            android:value="true" /&gt;

     * </pre>

     * </p>

     *

     * This API overrides the manifest tag value for this WebView.

     *

     * @param enabled Whether Safe browsing is enabled.

     */

    public abstract void setSafeBrowsingEnabled(boolean enabled);



    /**

     * Gets whether Safe browsing is enabled.

     * See {@link #setSafeBrowsingEnabled}.

     *

     * @return true if Safe browsing is enabled and false otherwise.

     */

    public abstract boolean getSafeBrowsingEnabled();





    /**

     * @hide

     */