commit ae16661808fdce7f78a299386b21f528d08ae3d2
author Chia-chi Yeh <chiachi@android.com> Wed Sep 28 16:38:18 2011 -0700
committer Chia-chi Yeh <chiachi@android.com> Mon Oct 03 14:04:42 2011 -0700
tree 4e0e4b21dc2dcf47e6c9b9807bd6bfecb5b235d3
parent aa035385d3f78fd2662ea561ce4ace982e154a5d

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

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 8112b1d..ca807ab 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2550,9 +2550,7 @@
     }
 
     public synchronized ProxyProperties getProxy() {
-        if (mGlobalProxy != null) return mGlobalProxy;
-        if (mDefaultProxy != null) return mDefaultProxy;
-        return null;
+        return mDefaultProxy;
     }
 
     public void setGlobalProxy(ProxyProperties proxyProperties) {
@@ -2583,7 +2581,7 @@
         if (mGlobalProxy == null) {
             proxyProperties = mDefaultProxy;
         }
-        sendProxyBroadcast(proxyProperties);
+        //sendProxyBroadcast(proxyProperties);
     }
 
     private void loadGlobalProxy() {
@@ -2619,9 +2617,6 @@
             }
         }
         if (VDBG) log("changing default proxy to " + proxy);
-
-        // global trumps default, if set, ignore this.
-        if (mGlobalProxy != null) return;
         sendProxyBroadcast(proxy);
     }