Merge "Fully remove startPacSystem() and stopPacSystem()" am: c7b4009f3e am: a93a01f9eb am: b803e8bf8d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229603

Change-Id: I0354b2337c1fb0280ae10f11aece1377b8f5b2fc

packages/services/PacProcessor/src/com/android/net/IProxyService.aidl

@@ -21,7 +21,4 @@ interface IProxyService
     String resolvePacFile(String host, String url);
 
     oneway void setPacFile(String scriptContents);
-
-    oneway void startPacSystem();
-    oneway void stopPacSystem();
 }

packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java

@@ -88,15 +88,5 @@ public class PacService extends Service {
             }
             mLibpac.setCurrentProxyScript(script);
         }
-
-        @Override
-        public void startPacSystem() throws RemoteException {
-            //TODO: remove
-        }
-
-        @Override
-        public void stopPacSystem() throws RemoteException {
-            //TODO: remove
-        }
     }
 }

services/core/java/com/android/server/connectivity/PacManager.java

@@ -196,13 +196,7 @@ public class PacManager {
                 mPacUrl = Uri.EMPTY;
                 mCurrentPac = null;
                 if (mProxyService != null) {
-                    try {
-                        mProxyService.stopPacSystem();
-                    } catch (RemoteException e) {
-                        Log.w(TAG, "Failed to stop PAC service", e);
-                    } finally {
-                        unbind();
-                    }
+                    unbind();
                 }
             }
             return DO_SEND_BROADCAST;
@@ -327,11 +321,6 @@ public class PacManager {
                     if (mProxyService == null) {
                         Log.e(TAG, "No proxy service");
                     } else {
-                        try {
-                            mProxyService.startPacSystem();
-                        } catch (RemoteException e) {
-                            Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e);
-                        }
                         mNetThreadHandler.post(mPacDownloader);
                     }
                 }