summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anna Malova <amalova@google.com> 2020-01-21 16:21:48 +0000
committer Anna Malova <amalova@google.com> 2020-01-21 16:24:53 +0000
commit113d302b49dc4689d93c41d0c8b54842f86c7bee (patch)
tree99704a55db4f776dd8acdf78d9d25ab4232f765a
parent61415d9ceff728f72c5ec2628952fda4e42691a4 (diff)
Rename PacProcessor#makeProxyRequest to PacProcessor#findProxyForUrl.
This name corresponds to the name of PAC script function. Bug: 148068051 Test: N/A Change-Id: I722318988367d86d149ddd7d5020022f7734adff
-rwxr-xr-xapi/system-current.txt2
-rw-r--r--core/java/android/webkit/PacProcessor.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index c4709c6fb036..a86a489b34e5 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12837,8 +12837,8 @@ package android.webkit {
}
public interface PacProcessor {
+ method @Nullable public String findProxyForUrl(@NonNull String);
method @NonNull public static android.webkit.PacProcessor getInstance();
- method @Nullable public String makeProxyRequest(@NonNull String);
method public boolean setProxyScript(@NonNull String);
}
diff --git a/core/java/android/webkit/PacProcessor.java b/core/java/android/webkit/PacProcessor.java
index fe8bbb8b6c82..5ef450fa65dd 100644
--- a/core/java/android/webkit/PacProcessor.java
+++ b/core/java/android/webkit/PacProcessor.java
@@ -54,5 +54,5 @@ public interface PacProcessor {
* For example: "PROXY xxx.xxx.xxx.xxx:xx; SOCKS yyy.yyy.yyy:yy".
*/
@Nullable
- String makeProxyRequest(@NonNull String url);
+ String findProxyForUrl(@NonNull String url);
}