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

Commit e7534f48 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

Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
parents d2d45e9d c922c482

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -48708,6 +48708,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();
@@ -48757,6 +48758,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
@@ -52342,6 +52342,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();
@@ -52397,6 +52398,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
@@ -49106,6 +49106,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();
@@ -49155,6 +49156,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

     */