Rename PacManager to PacProxyInstaller

Generally, a manager class in Android is used to access
system services and it should be obtained from Context.
This class is a bit different from the definition of a
manager class.

API linter will detect an error if trying to expose a
class name end with Manager. ProxyTracker will create a
new instance of this class so this class needs to be
renamed to avoid API lint error.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I9185d4fb4342bd285a575f0bdd3518b758f37eb6

2 files changed, 4 insertions, 5 deletions

diff --git a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java
index ac402228a180..f8b9309f9a7f 100644
--- a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java
+++ b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java
@@ -19,8 +19,8 @@ import android.os.RemoteException;
 import android.util.Log;
 
 import com.android.net.IProxyPortListener;
+
 import com.google.android.collect.Lists;
-import com.google.android.collect.Sets;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,7 +34,6 @@ import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -361,7 +360,7 @@ public class ProxyServer extends Thread {
             try {
                 mCallback.setProxyPort(port);
             } catch (RemoteException e) {
-                Log.w(TAG, "Proxy failed to report port to PacManager", e);
+                Log.w(TAG, "Proxy failed to report port to PacProxyInstaller", e);
             }
         }
         mPort = port;
@@ -372,7 +371,7 @@ public class ProxyServer extends Thread {
             try {
                 callback.setProxyPort(mPort);
             } catch (RemoteException e) {
-                Log.w(TAG, "Proxy failed to report port to PacManager", e);
+                Log.w(TAG, "Proxy failed to report port to PacProxyInstaller", e);
             }
         }
         mCallback = callback;
diff --git a/packages/services/Proxy/src/com/android/proxyhandler/ProxyService.java b/packages/services/Proxy/src/com/android/proxyhandler/ProxyService.java
index 970fdc727ded..bdf478d36c8c 100644
--- a/packages/services/Proxy/src/com/android/proxyhandler/ProxyService.java
+++ b/packages/services/Proxy/src/com/android/proxyhandler/ProxyService.java
@@ -30,7 +30,7 @@ public class ProxyService extends Service {
 
     private static ProxyServer server = null;
 
-    /** Keep these values up-to-date with PacManager.java */
+    /** Keep these values up-to-date with PacProxyInstaller.java */
     public static final String KEY_PROXY = "keyProxy";
     public static final String HOST = "localhost";
     public static final String EXCL_LIST = "";