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

Commit 070e3c0c authored by Nate Fischer's avatar Nate Fischer Committed by Android (Google) Code Review
Browse files

Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev

parents 60409a92 3898ac12

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49062,6 +49062,7 @@ package android.webkit { 
    method public int getProgress();

    method public boolean getRendererPriorityWaivedWhenNotVisible();

    method public int getRendererRequestedPriority();

    method public static android.net.Uri getSafeBrowsingPrivacyPolicyUrl();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();

api/system-current.txt

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

    method public boolean getRendererPriorityWaivedWhenNotVisible();

    method public int getRendererRequestedPriority();

    method public static android.net.Uri getSafeBrowsingPrivacyPolicyUrl();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();
@@ -53096,6 +53097,7 @@ package android.webkit { 
    method public abstract java.lang.String findAddress(java.lang.String);

    method public abstract void freeMemoryForTests();

    method public abstract java.lang.String getDefaultUserAgent(android.content.Context);

    method public abstract android.net.Uri getSafeBrowsingPrivacyPolicyUrl();

    method public abstract void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);

    method public abstract android.net.Uri[] parseFileChooserResult(int, android.content.Intent);

    method public abstract void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.Boolean>);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49509,6 +49509,7 @@ package android.webkit { 
    method public int getProgress();

    method public boolean getRendererPriorityWaivedWhenNotVisible();

    method public int getRendererRequestedPriority();

    method public static android.net.Uri getSafeBrowsingPrivacyPolicyUrl();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();

core/java/android/webkit/SafeBrowsingResponse.java

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ package android.webkit; 
 * created by the WebView and passed to {@link android.webkit.WebViewClient#onSafeBrowsingHit}. The

 * host application must call {@link #showInterstitial(boolean)}, {@link #proceed(boolean)}, or

 * {@link #backToSafety(boolean)} to set the WebView's response to the Safe Browsing hit.

 *

 * <p>

 * If reporting is enabled, all reports will be sent according to the privacy policy referenced by

 * {@link android.webkit.WebView#getSafeBrowsingPrivacyPolicyUrl()}.

 * </p>

 */

public abstract class SafeBrowsingResponse {

core/java/android/webkit/WebView.java

+10 −0
Original line number Diff line number Diff line
@@ -1699,6 +1699,16 @@ public class WebView extends AbsoluteLayout 
        getFactory().getStatics().setSafeBrowsingWhitelist(urls, callback);

    }



    /**

     * Returns a URL pointing to the privacy policy for Safe Browsing reporting.

     *

     * @return the url pointing to a privacy policy document which can be displayed to users.

     */

    @NonNull

    public static Uri getSafeBrowsingPrivacyPolicyUrl() {

        return getFactory().getStatics().getSafeBrowsingPrivacyPolicyUrl();

    }



    /**

     * Gets the WebBackForwardList for this WebView. This contains the

     * back/forward list for use in querying each item in the history stack.