Merge changes from topic "pacproxy-service"

* changes: Make PacProxyService be a system service Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
parent 3a810d379a f9fa0b95a8
commit c8e73fa90b
3 changed files with 37 additions and 13 deletions
--- a/framework/src/android/net/ProxyInfo.java
+++ b/framework/src/android/net/ProxyInfo.java
@@ -129,7 +129,7 @@ public class ProxyInfo implements Parcelable {
    }

    /**
-     * Only used in PacProxyInstaller after Local Proxy is bound.
+     * Only used in PacProxyService after Local Proxy is bound.
     * @hide
     */
    public ProxyInfo(@NonNull Uri pacFileUrl, int localProxyPort) {