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

ConnectivityService: detach the logic of global proxy.

Browse Source 
The current implementation of global proxy is dead,
and it will be removed completely in separate changes.

Change-Id: I54f6b3960f761483d28d808e99db4c71c9c0348d
This commit is contained in:
Chia-chi Yeh
2011-09-28 16:38:18 -07:00
parent aa035385d3
commit ae16661808
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/ConnectivityService.java
View File

@@ -2550,9 +2550,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
public synchronized ProxyProperties getProxy() { public synchronized ProxyProperties getProxy() {
if (mGlobalProxy != null) return mGlobalProxy; return mDefaultProxy;
if (mDefaultProxy != null) return mDefaultProxy;
return null;
} }
public void setGlobalProxy(ProxyProperties proxyProperties) { public void setGlobalProxy(ProxyProperties proxyProperties) {
@@ -2583,7 +2581,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mGlobalProxy == null) { if (mGlobalProxy == null) {
proxyProperties = mDefaultProxy; proxyProperties = mDefaultProxy;
} }
sendProxyBroadcast(proxyProperties); //sendProxyBroadcast(proxyProperties);
} }
private void loadGlobalProxy() { private void loadGlobalProxy() {
@@ -2619,9 +2617,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
if (VDBG) log("changing default proxy to " + proxy); if (VDBG) log("changing default proxy to " + proxy);
// global trumps default, if set, ignore this.
if (mGlobalProxy != null) return;
sendProxyBroadcast(proxy); sendProxyBroadcast(proxy);
} }