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

Commit b7090d68 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Load persisted global proxy settings. 

Was persisted before, but not loaded at boot.

Change-Id: I6d6b69ede3d212a8266847d73d07a037ae917788
parent 5e3af5fc

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

+17 −1
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


        mSettingsObserver = new SettingsObserver(mHandler, EVENT_APPLY_GLOBAL_HTTP_PROXY);

        mSettingsObserver.observe(mContext);



        loadGlobalProxy();

    }
@@ -2099,6 +2101,20 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        sendProxyBroadcast(proxyProperties);

    }



    private void loadGlobalProxy() {

        ContentResolver res = mContext.getContentResolver();

        String host = Settings.Secure.getString(res, Settings.Secure.GLOBAL_HTTP_PROXY_HOST);

        int port = Settings.Secure.getInt(res, Settings.Secure.GLOBAL_HTTP_PROXY_PORT, 0);

        String exclList = Settings.Secure.getString(res,

                Settings.Secure.GLOBAL_HTTP_PROXY_EXCLUSION_LIST);

        if (!TextUtils.isEmpty(host)) {

            ProxyProperties proxyProperties = new ProxyProperties(host, port, exclList);

            synchronized (mGlobalProxyLock) {

                mGlobalProxy = proxyProperties;

            }

        }

    }



    public ProxyProperties getGlobalProxy() {

        synchronized (mGlobalProxyLock) {

            return mGlobalProxy;