| commit | 90b574ef059bcae88ecaa5870f095706432d581c | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Sep 21 16:37:34 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Sep 21 16:37:34 2011 -0700 |
| tree | 49f95aa21d780c4e264878e4b0a895dd20ea822a | |
| parent | a7d56571c2a018c8056f4359366c17311adb3d04 [diff] [blame] |
Notify people of empty proxies too. We were telling people when the proxy changed, except if it was changed to null. bug:5263946 Change-Id: I83416dac8fe992168a8aafd5676f9faee4e484d0
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 23fab72..e28c715 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java
@@ -2618,7 +2618,8 @@ } } if (VDBG) log("changing default proxy to " + proxy); - if ((proxy == null && mGlobalProxy == null) || proxy.equals(mGlobalProxy)) return; + + // global trumps default, if set, ignore this. if (mGlobalProxy != null) return; sendProxyBroadcast(proxy); }