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

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

Change-Id: Ia0efed98d7e673259e2d16fa497ce9652be477b1
This commit is contained in:
Treehugger Robot
2020-07-16 13:45:53 +00:00
committed by Automerger Merge Worker
3 changed files with 1 additions and 25 deletions

View File

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

View File

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

View File

@@ -196,15 +196,9 @@ public class PacManager {
mPacUrl = Uri.EMPTY; mPacUrl = Uri.EMPTY;
mCurrentPac = null; mCurrentPac = null;
if (mProxyService != 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; return DO_SEND_BROADCAST;
} }
} }
@@ -327,11 +321,6 @@ public class PacManager {
if (mProxyService == null) { if (mProxyService == null) {
Log.e(TAG, "No proxy service"); Log.e(TAG, "No proxy service");
} else { } else {
try {
mProxyService.startPacSystem();
} catch (RemoteException e) {
Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e);
}
mNetThreadHandler.post(mPacDownloader); mNetThreadHandler.post(mPacDownloader);
} }
} }