diff --git a/api/current.txt b/api/current.txt index 70bad4356da31..ba8e448f01579 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/system-current.txt b/api/system-current.txt index 9be556a56dfbd..d68e5f5093775 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/api/test-current.txt b/api/test-current.txt index 09bcb7f548c7e..29252a8763fed 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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); diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 61920bd5cee42..3a6de9609b3c8 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -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. + *

+ *

+     * <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing"
+     *            android:value="true" />
+     * 
+ *

+ * + * 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 */