From 90b574ef059bcae88ecaa5870f095706432d581c Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 21 Sep 2011 16:37:34 -0700 Subject: [PATCH] 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 --- services/java/com/android/server/ConnectivityService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 23fab72dc5..e28c715179 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2618,7 +2618,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } 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); }