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

Commit b54e0aa2 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix parsing of global:http_proxy value."

parents 2267a786 7b8e1ea1

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

+6 −0
Original line number Diff line number Diff line
@@ -3134,6 +3134,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                Settings.Global.HTTP_PROXY);

        if (!TextUtils.isEmpty(proxy)) {

            String data[] = proxy.split(":");

            if (data.length == 0) {

                return;

            }



            String proxyHost =  data[0];

            int proxyPort = 8080;

            if (data.length > 1) {
@@ -3145,6 +3149,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            }

            ProxyProperties p = new ProxyProperties(data[0], proxyPort, "");

            setGlobalProxy(p);

        } else {

            setGlobalProxy(null);

        }

    }