Merge "Add PacProcessor system API." (6c0d5990) · Commits · e / os / android_frameworks_base

api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -12278,6 +12278,12 @@ package android.webkit {
		method public void onJsResultComplete(android.webkit.JsResult);
		}

		public interface PacProcessor {
		method @NonNull public static android.webkit.PacProcessor getInstance();
		method @Nullable public String makeProxyRequest(@NonNull String);
		method public boolean setProxyScript(@NonNull String);
		}

		public class SslErrorHandler extends android.os.Handler {
		ctor public SslErrorHandler();
		}
		@@ -12412,6 +12418,7 @@ package android.webkit {
		method public android.webkit.WebViewProvider createWebView(android.webkit.WebView, android.webkit.WebView.PrivateAccess);
		method public android.webkit.CookieManager getCookieManager();
		method public android.webkit.GeolocationPermissions getGeolocationPermissions();
		method @NonNull public default android.webkit.PacProcessor getPacProcessor();
		method public android.webkit.ServiceWorkerController getServiceWorkerController();
		method public android.webkit.WebViewFactoryProvider.Statics getStatics();
		method @Deprecated public android.webkit.TokenBindingService getTokenBindingService();

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.webkit;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;


		/**
		* Class to evaluate PAC scripts.
		* @hide
		*/

		@SystemApi
		public interface PacProcessor {

		/**
		* Returns the default PacProcessor instance.
		*
		* @return the default PacProcessor instance.
		*/
		@NonNull
		static PacProcessor getInstance() {
		return WebViewFactory.getProvider().getPacProcessor();
		}

		/**
		* Set PAC script to use.
		*
		* @param script PAC script.
		* @return true if PAC script is successfully set.
		*/
		boolean setProxyScript(@NonNull String script);

		/**
		* Gets a list of proxy servers to use.
		* @param url The URL being accessed.
		* @return a PAC-style semicolon-separated list of valid proxy servers.
		* For example: "PROXY xxx.xxx.xxx.xxx:xx; SOCKS yyy.yyy.yyy:yy".
		*/
		@Nullable
		String makeProxyRequest(@NonNull String url);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,15 @@ public interface WebViewFactoryProvider {
		*/
		WebViewDatabase getWebViewDatabase(Context context);

		/**
		* Gets the singleton PacProcessor instance.
		* @return the PacProcessor instance
		*/
		@NonNull
		default PacProcessor getPacProcessor() {
		throw new UnsupportedOperationException("Not implemented");
		}

		/**
		* Gets the classloader used to load internal WebView implementation classes. This interface
		* should only be used by the WebView Support Library.