Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b803e8bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fully remove startPacSystem() and stopPacSystem()" am: c7b4009f am: a93a01f9 

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

Change-Id: Ib737ebd197e06ea673522bcc31cc37e9dcf05a31
parents 2c50b0ef a93a01f9

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

+0 −3
Original line number Diff line number Diff line
@@ -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

+0 −10
Original line number Diff line number Diff line
@@ -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

+1 −12
Original line number Diff line number Diff line
@@ -196,15 +196,9 @@ 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();

                }

            }

            }

            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);

                    }

                }