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

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

Merge "WebView: add APIs for setSafeBrowsingWhiteList"

parents 3c1d4d6e bf158ec3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49030,6 +49030,7 @@ package android.webkit { 
    method public void setNetworkAvailable(boolean);

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhiteList(java.lang.String[]);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

api/system-current.txt

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

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhiteList(java.lang.String[]);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);
@@ -52882,6 +52883,7 @@ package android.webkit { 
    method public abstract java.lang.String getDefaultUserAgent(android.content.Context);

    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.lang.String[]);

    method public abstract void setWebContentsDebuggingEnabled(boolean);

    method public abstract void shutdownSafeBrowsing();

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49451,6 +49451,7 @@ package android.webkit { 
    method public void setNetworkAvailable(boolean);

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhiteList(java.lang.String[]);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

core/java/android/webkit/WebView.java

+11 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,17 @@ public class WebView extends AbsoluteLayout 
        getFactory().getStatics().shutdownSafeBrowsing();

    }



    /**

     * Sets the list of domains that are exempt from SafeBrowsing checks. The list is

     * global for all the WebViews.

     * TODO: Add documentation for the format of the urls.

     *

     * @param urls the list of URLs

     */

    public static void setSafeBrowsingWhiteList(@Nullable String[] urls) {

        getFactory().getStatics().setSafeBrowsingWhiteList(urls);

    }



    /**

     * Gets the WebBackForwardList for this WebView. This contains the

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

core/java/android/webkit/WebViewFactoryProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ public interface WebViewFactoryProvider { 
         * {@link android.webkit.WebView#shutdownSafeBrowsing()}

         */

        void shutdownSafeBrowsing();



        /**

        * Implement the API method

        * {@link android.webkit.WebView#setSafeBrowsingWhiteList(String[])}

        */

        void setSafeBrowsingWhiteList(String[] urls);

    }



    Statics getStatics();