LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f

Browse Source 
am: fa17d29fa9

Change-Id: I4220b1964040affa39d8d748095a161b2512eccf
This commit is contained in:
Chalard Jean
2018-10-05 02:33:45 -07:00
committed by android-build-merger
parent 1ea270c94d fa17d29fa9
commit b3ba9ff8ab
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -1837,7 +1837,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
void systemReady() { void systemReady() {
loadGlobalProxy(); mProxyTracker.loadGlobalProxy();
registerNetdEventCallback(); registerNetdEventCallback();
synchronized (this) { synchronized (this) {
@@ -3455,31 +3455,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
mProxyTracker.setGlobalProxy(proxyProperties); mProxyTracker.setGlobalProxy(proxyProperties);
} }
private void loadGlobalProxy() {
ContentResolver res = mContext.getContentResolver();
String host = Settings.Global.getString(res, Settings.Global.GLOBAL_HTTP_PROXY_HOST);
int port = Settings.Global.getInt(res, Settings.Global.GLOBAL_HTTP_PROXY_PORT, 0);
String exclList = Settings.Global.getString(res,
Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST);
String pacFileUrl = Settings.Global.getString(res, Settings.Global.GLOBAL_HTTP_PROXY_PAC);
if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) {
ProxyInfo proxyProperties;
if (!TextUtils.isEmpty(pacFileUrl)) {
proxyProperties = new ProxyInfo(pacFileUrl);
} else {
proxyProperties = new ProxyInfo(host, port, exclList);
}
if (!proxyProperties.isValid()) {
if (DBG) log("Invalid proxy properties, ignoring: " + proxyProperties.toString());
return;
}
synchronized (mProxyTracker.mProxyLock) {
mProxyTracker.mGlobalProxy = proxyProperties;
}
}
}
@Override @Override
@Nullable @Nullable
public ProxyInfo getGlobalProxy() { public ProxyInfo getGlobalProxy() {

29
services/core/java/com/android/server/connectivity/ProxyTracker.java
View File

@@ -141,6 +141,35 @@ public class ProxyTracker {
} }
} }
/**
* Read the global proxy settings and cache them in memory.
*/
public void loadGlobalProxy() {
ContentResolver res = mContext.getContentResolver();
String host = Settings.Global.getString(res, Settings.Global.GLOBAL_HTTP_PROXY_HOST);
int port = Settings.Global.getInt(res, Settings.Global.GLOBAL_HTTP_PROXY_PORT, 0);
String exclList = Settings.Global.getString(res,
Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST);
String pacFileUrl = Settings.Global.getString(res, Settings.Global.GLOBAL_HTTP_PROXY_PAC);
if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(pacFileUrl)) {
ProxyInfo proxyProperties;
if (!TextUtils.isEmpty(pacFileUrl)) {
proxyProperties = new ProxyInfo(pacFileUrl);
} else {
proxyProperties = new ProxyInfo(host, port, exclList);
}
if (!proxyProperties.isValid()) {
if (DBG) Slog.d(TAG, "Invalid proxy properties, ignoring: " + proxyProperties);
return;
}
synchronized (mProxyLock) {
mGlobalProxy = proxyProperties;
}
}
// TODO : shouldn't this function call mPacManager.setCurrentProxyScriptUrl ?
}
/** /**
* Sends the system broadcast informing apps about a new proxy configuration. * Sends the system broadcast informing apps about a new proxy configuration.
* *