Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55985bed authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Make sure the ProxyProperties is always present. 

Lets people know that it's non-null, though the InetAddr inside may be.

bug:3305689
Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
parent 03ee779b

core/java/android/net/Proxy.java

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ public final class Proxy { 
     * that either the default connection or its proxy has changed.

     * The intent will have the following extra value:</p>

     * <ul>

     *   <li><em>EXTRA_PROXY_INFO</em> - The ProxyProperties for the proxy

     *   <li><em>EXTRA_PROXY_INFO</em> - The ProxyProperties for the proxy.  Non-null,

     *                                   though if the proxy is undefined the host string

     *                                   will be empty.

     * </ul>

     *

     * <p class="note">This is a protected intent that can only be sent by the system

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

+1 −0
Original line number Diff line number Diff line
@@ -2154,6 +2154,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    }



    private void sendProxyBroadcast(ProxyProperties proxy) {

        if (proxy == null) proxy = new ProxyProperties("", 0, "");

        log("sending Proxy Broadcast for " + proxy);

        Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);