commit 9be9a4b6ef055a9933b189111d9b50db8fcee09c
author Chalard Jean <jchalard@google.com> Fri Jun 08 19:45:27 2018 +0900
committer Chalard Jean <jchalard@google.com> Mon Oct 15 12:58:41 2018 +0900
tree 09df3e59ebff88e29f669b4dbedc2200f7f1038c
parent 221019a4c6ad56037e939c1fbfbbb045b09c213a

[PT15] Tiny bugfix in setGlobalProxy

This bug has existed for a long time. If mDefaultProxyEnabled is
false, then the mDefaultProxy member should obviously not be used
in the broadcast.

Test: runtest
Change-Id: I599a2ff9f96d4667e824cf000c2125f86010bb02

services/core/java/com/android/server/connectivity/ProxyTracker.java

diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java
index a90bba0..de8ae35 100644
--- a/services/core/java/com/android/server/connectivity/ProxyTracker.java
+++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java
@@ -269,7 +269,7 @@
                 Binder.restoreCallingIdentity(token);
             }
 
-            sendProxyBroadcast(mGlobalProxy == null ? mDefaultProxy : proxyInfo);
+            sendProxyBroadcast(getDefaultProxy());
         }
     }