Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c922c4827a

Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
This commit is contained in:
Selim Gurun
2017-04-10 16:48:28 +00:00
committed by android-build-merger
parent d2d45e9de8 c922c4827a
commit e7534f48ce
4 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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);

2
api/system-current.txt
View File

@@ -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);

2
api/test-current.txt
View File

@@ -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);

30
core/java/android/webkit/WebSettings.java
View File

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