joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add tests for PAC proxies." am: 5e76b40973 am: 4155e6ec97 am: 4ae128e7e1

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729152

Change-Id: Ifc4c685e724de1c3727b560d0213b4257f71da54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jean Chalard 2023-06-01 21:59:13 +00:00 • committed by Automerger Merge Worker
commit cab00afb88
1 changed files with 215 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
service/src/com/android/server/ConnectivityService.java
View file

@ -862,8 +862,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// A helper object to track the current default HTTP proxy. ConnectivityService needs to tell
// the world when it changes.
@VisibleForTesting
protected final ProxyTracker mProxyTracker;
private final ProxyTracker mProxyTracker;
final private SettingsObserver mSettingsObserver;
@ -1867,6 +1866,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
mHandler.sendEmptyMessage(EVENT_INGRESS_RATE_LIMIT_CHANGED);
}
@VisibleForTesting
void simulateUpdateProxyInfo(@Nullable final Network network,
@NonNull final ProxyInfo proxyInfo) {
Message.obtain(mHandler, EVENT_PROXY_HAS_CHANGED,
new Pair<>(network, proxyInfo)).sendToTarget();
}
private void handleAlwaysOnNetworkRequest(
NetworkRequest networkRequest, String settingName, boolean defaultValue) {
final boolean enable = toBool(Settings.Global.getInt(