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

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

Merge "WebView: fix WebView#setSafeBrowsingWhiteList"

parents a9a380e5 520a8ba2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -49065,7 +49065,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 static void setSafeBrowsingWhiteList(java.util.List<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 −2
Original line number Diff line number Diff line
@@ -52716,7 +52716,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 static void setSafeBrowsingWhiteList(java.util.List<java.lang.String>);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

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

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

    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
@@ -49495,7 +49495,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 static void setSafeBrowsingWhiteList(java.util.List<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

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import java.io.BufferedWriter; 
import java.io.File;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.List;

import java.util.Map;



/**
@@ -1644,7 +1645,7 @@ public class WebView extends AbsoluteLayout 
     *

     * @param urls the list of URLs

     */

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

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

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

    }

core/java/android/webkit/WebViewFactoryProvider.java

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.content.Context; 
import android.content.Intent;

import android.net.Uri;



import java.util.List;



/**

 * This is the main entry-point into the WebView back end implementations, which the WebView

 * proxy class uses to instantiate all the other objects as needed. The backend must provide an
@@ -89,9 +91,9 @@ public interface WebViewFactoryProvider { 


        /**

        * Implement the API method

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

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

        */

        void setSafeBrowsingWhiteList(String[] urls);

        void setSafeBrowsingWhiteList(List<String> urls);

    }



    Statics getStatics();