Merge "Rename PacProcessor#makeProxyRequest to PacProcessor#findProxyForUrl."

2 files changed, 2 insertions, 2 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index 4bd2ed574e96..ba6a2ef05329 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -13616,8 +13616,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);
 }