am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev (63582a79) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1136,7 +1136,7 @@ public class ConnectivityManager {
		* HTTP proxy. A {@code null} value will clear the global HTTP proxy.
		*
		* <p>This method requires the call to hold the permission
		* {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
		* {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.
		* {@hide}
		*/
		public void setGlobalProxy(ProxyProperties p) {

+10 −5

Original line number	Diff line number	Diff line
		@@ -3045,7 +3045,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}

		public void setGlobalProxy(ProxyProperties proxyProperties) {
		enforceChangePermission();
		enforceConnectivityInternalPermission();
		synchronized (mProxyLock) {
		if (proxyProperties == mGlobalProxy) return;
		if (proxyProperties != null && proxyProperties.equals(mGlobalProxy)) return;
		@@ -3063,10 +3063,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		mGlobalProxy = null;
		}
		ContentResolver res = mContext.getContentResolver();
		final long token = Binder.clearCallingIdentity();
		try {
		Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_HOST, host);
		Settings.Global.putInt(res, Settings.Global.GLOBAL_HTTP_PROXY_PORT, port);
		Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST,
		exclList);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		if (mGlobalProxy == null) {