commit 3c443fcf403cb3a55fac8f12e5c1f75aade410e0
author Chalard Jean <jchalard@google.com> Thu Jun 07 18:37:59 2018 +0900
committer Chalard Jean <jchalard@google.com> Tue Jun 12 19:03:15 2018 +0900
tree 5cfa02822d805d0581be763a8483ee91336f5500
parent 3319c62dfe67a0f263de4002409f96d17fd211ca

[PT06] Move setGlobalProxy into ProxyTracker

Test: runtest
Change-Id: I6abd2221882db368a411b7174c66d8bd3b6b5110

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 3d923a9..dadd327 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3292,57 +3292,10 @@
         }
     }
 
-    public void setGlobalProxy(ProxyInfo proxyProperties) {
+    @Override
+    public void setGlobalProxy(final ProxyInfo proxyProperties) {
         enforceConnectivityInternalPermission();
-
-        synchronized (mProxyTracker.mProxyLock) {
-            if (proxyProperties == mProxyTracker.mGlobalProxy) return;
-            if (proxyProperties != null && proxyProperties.equals(mProxyTracker.mGlobalProxy)) {
-                return;
-            }
-            if (mProxyTracker.mGlobalProxy != null
-                    && mProxyTracker.mGlobalProxy.equals(proxyProperties)) {
-                return;
-            }
-
-            String host = "";
-            int port = 0;
-            String exclList = "";
-            String pacFileUrl = "";
-            if (proxyProperties != null && (!TextUtils.isEmpty(proxyProperties.getHost()) ||
-                    !Uri.EMPTY.equals(proxyProperties.getPacFileUrl()))) {
-                if (!proxyProperties.isValid()) {
-                    if (DBG)
-                        log("Invalid proxy properties, ignoring: " + proxyProperties.toString());
-                    return;
-                }
-                mProxyTracker.mGlobalProxy = new ProxyInfo(proxyProperties);
-                host = mProxyTracker.mGlobalProxy.getHost();
-                port = mProxyTracker.mGlobalProxy.getPort();
-                exclList = mProxyTracker.mGlobalProxy.getExclusionListAsString();
-                if (!Uri.EMPTY.equals(proxyProperties.getPacFileUrl())) {
-                    pacFileUrl = proxyProperties.getPacFileUrl().toString();
-                }
-            } else {
-                mProxyTracker.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);
-                Settings.Global.putString(res, Settings.Global.GLOBAL_HTTP_PROXY_PAC, pacFileUrl);
-            } finally {
-                Binder.restoreCallingIdentity(token);
-            }
-
-            if (mProxyTracker.mGlobalProxy == null) {
-                proxyProperties = mProxyTracker.mDefaultProxy;
-            }
-            mProxyTracker.sendProxyBroadcast(proxyProperties);
-        }
+        mProxyTracker.setGlobalProxy(proxyProperties);
     }
 
     private void loadGlobalProxy() {