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

Commit 8e82f012 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WebView: change setSafeBrowsingWhiteList signature"

parents a109f975 d6385d32

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -49080,7 +49080,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.util.List<java.lang.String>);

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

    method public deprecated void setVerticalScrollbarOverlay(boolean);

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

    method public static void setWebContentsDebuggingEnabled(boolean);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -52766,7 +52766,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.util.List<java.lang.String>);

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

    method public deprecated void setVerticalScrollbarOverlay(boolean);

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

    method public static void setWebContentsDebuggingEnabled(boolean);
@@ -52968,7 +52968,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.util.List<java.lang.String>);

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

    method public abstract void setWebContentsDebuggingEnabled(boolean);

    method public abstract void shutdownSafeBrowsing();

  }

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -49502,7 +49502,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.util.List<java.lang.String>);

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

    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

+6 −2
Original line number Diff line number Diff line
@@ -1645,9 +1645,13 @@ public class WebView extends AbsoluteLayout 
     * TODO: Add documentation for the format of the urls.

     *

     * @param urls the list of URLs

     * @param callback will be called with true if URLs are successfully added to the whitelist. It

     * will be called with false if any URLs are malformed. The callback will be run on the UI

     * thread.

     */

    public static void setSafeBrowsingWhiteList(@Nullable List<String> urls) {

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

    public static void setSafeBrowsingWhitelist(@Nullable List<String> urls,

            @Nullable ValueCallback<Boolean> callback) {

        getFactory().getStatics().setSafeBrowsingWhitelist(urls, callback);

    }



    /**

core/java/android/webkit/WebViewFactoryProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -91,9 +91,10 @@ public interface WebViewFactoryProvider { 


        /**

        * Implement the API method

        * {@link android.webkit.WebView#setSafeBrowsingWhiteList(List<String>)}

        * {@link android.webkit.WebView#setSafeBrowsingWhitelist(List<String>,

        * ValueCallback<Boolean>)}

        */

        void setSafeBrowsingWhiteList(List<String> urls);

        void setSafeBrowsingWhitelist(List<String> urls, ValueCallback<Boolean> callback);

    }



    Statics getStatics();