summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java3
-rw-r--r--core/java/android/webkit/WebViewFactoryProvider.java6
2 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5fed925dd956..fad475c034a0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -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);
}
diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java
index 7c938ae5bb70..9b31a0c7462d 100644
--- a/core/java/android/webkit/WebViewFactoryProvider.java
+++ b/core/java/android/webkit/WebViewFactoryProvider.java
@@ -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();