Skip to content

Commit e4474c3

Browse files
author
Chia-chi Yeh
committed
ConnectivityService: detach the logic of global proxy.
The current implementation of global proxy is dead, and it will be removed completely in separate changes. Change-Id: I54f6b3960f761483d28d808e99db4c71c9c0348d
1 parent b9e7e13 commit e4474c3

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

services/java/com/android/server/ConnectivityService.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2550,9 +2550,7 @@ private void handleInetConditionHoldEnd(int netType, int sequence) {
25502550
}
25512551

25522552
public synchronized ProxyProperties getProxy() {
2553-
if (mGlobalProxy != null) return mGlobalProxy;
2554-
if (mDefaultProxy != null) return mDefaultProxy;
2555-
return null;
2553+
return mDefaultProxy;
25562554
}
25572555

25582556
public void setGlobalProxy(ProxyProperties proxyProperties) {
@@ -2583,7 +2581,7 @@ public void setGlobalProxy(ProxyProperties proxyProperties) {
25832581
if (mGlobalProxy == null) {
25842582
proxyProperties = mDefaultProxy;
25852583
}
2586-
sendProxyBroadcast(proxyProperties);
2584+
//sendProxyBroadcast(proxyProperties);
25872585
}
25882586

25892587
private void loadGlobalProxy() {
@@ -2619,9 +2617,6 @@ private void handleApplyDefaultProxy(int type) {
26192617
}
26202618
}
26212619
if (VDBG) log("changing default proxy to " + proxy);
2622-
2623-
// global trumps default, if set, ignore this.
2624-
if (mGlobalProxy != null) return;
26252620
sendProxyBroadcast(proxy);
26262621
}
26272622

0 commit comments

Comments
 (0)