Merge "Load persisted global proxy settings." (c8f16ec9) · Commits · e / os / android_frameworks_base

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;