commit 893783ed8768a98cbfea09c4e60093e2580dd22b
author Chia-chi Yeh <chiachi@android.com> Thu Oct 06 15:29:43 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 06 15:29:43 2011 -0700
tree cc55c56f5a823692e49ead62215339f330147d21
parent 85b9edf2da0534bc53d139bb88cda8866d265afe
parent e4474c3b7098a13bc81b0dba35bacd93b8a22f79

Merge "ConnectivityService: detach the logic of global proxy."

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);
     }