From fa4c8620015ffc3c37607923037b3cfd925370c2 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Thu, 7 Jun 2018 16:44:04 +0900 Subject: [PATCH] [PT01] Introduce ProxyTracker The goal of this is to simplify ConnectivityService by reducing the amount of code it contains. This is small enough to be obviously correct and followup changes will move code into this class. Test: runtest Change-Id: Ic5ab19b521e98ae397c9bf657856820304362fbb --- .../android/server/ConnectivityService.java | 96 ++++++++++--------- .../server/connectivity/ProxyTracker.java | 43 +++++++++ 2 files changed, 95 insertions(+), 44 deletions(-) create mode 100644 services/core/java/com/android/server/connectivity/ProxyTracker.java diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ec11bd9374..05b929f158 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -153,6 +153,7 @@ import com.android.server.connectivity.NetworkNotificationManager; import com.android.server.connectivity.NetworkNotificationManager.NotificationType; import com.android.server.connectivity.PacManager; import com.android.server.connectivity.PermissionMonitor; +import com.android.server.connectivity.ProxyTracker; import com.android.server.connectivity.Tethering; import com.android.server.connectivity.Vpn; import com.android.server.connectivity.tethering.TetheringDependencies; @@ -426,13 +427,9 @@ public class ConnectivityService extends IConnectivityManager.Stub private int mNetTransitionWakeLockTimeout; private final PowerManager.WakeLock mPendingIntentWakeLock; - // track the current default http proxy - tell the world if we get a new one (real change) - private volatile ProxyInfo mDefaultProxy = null; - private final Object mProxyLock = new Object(); - private boolean mDefaultProxyDisabled = false; - - // track the global proxy. - private ProxyInfo mGlobalProxy = null; + // A helper object to track the current default HTTP proxy. ConnectivityService needs to tell + // the world when it changes. + private final ProxyTracker mProxyTracker = new ProxyTracker(); private PacManager mPacManager = null; @@ -3286,9 +3283,11 @@ public class ConnectivityService extends IConnectivityManager.Stub // so this API change wouldn't have a benefit. It also breaks the passing // of proxy info to all the JVMs. // enforceAccessPermission(); - synchronized (mProxyLock) { - ProxyInfo ret = mGlobalProxy; - if ((ret == null) && !mDefaultProxyDisabled) ret = mDefaultProxy; + synchronized (mProxyTracker.mProxyLock) { + ProxyInfo ret = mProxyTracker.mGlobalProxy; + if ((ret == null) && !mProxyTracker.mDefaultProxyDisabled) { + ret = mProxyTracker.mDefaultProxy; + } return ret; } } @@ -3341,10 +3340,15 @@ public class ConnectivityService extends IConnectivityManager.Stub public void setGlobalProxy(ProxyInfo proxyProperties) { enforceConnectivityInternalPermission(); - synchronized (mProxyLock) { - if (proxyProperties == mGlobalProxy) return; - if (proxyProperties != null && proxyProperties.equals(mGlobalProxy)) return; - if (mGlobalProxy != null && mGlobalProxy.equals(proxyProperties)) return; + 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; @@ -3357,15 +3361,15 @@ public class ConnectivityService extends IConnectivityManager.Stub log("Invalid proxy properties, ignoring: " + proxyProperties.toString()); return; } - mGlobalProxy = new ProxyInfo(proxyProperties); - host = mGlobalProxy.getHost(); - port = mGlobalProxy.getPort(); - exclList = mGlobalProxy.getExclusionListAsString(); + 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 { - mGlobalProxy = null; + mProxyTracker.mGlobalProxy = null; } ContentResolver res = mContext.getContentResolver(); final long token = Binder.clearCallingIdentity(); @@ -3379,8 +3383,8 @@ public class ConnectivityService extends IConnectivityManager.Stub Binder.restoreCallingIdentity(token); } - if (mGlobalProxy == null) { - proxyProperties = mDefaultProxy; + if (mProxyTracker.mGlobalProxy == null) { + proxyProperties = mProxyTracker.mDefaultProxy; } sendProxyBroadcast(proxyProperties); } @@ -3405,8 +3409,8 @@ public class ConnectivityService extends IConnectivityManager.Stub return; } - synchronized (mProxyLock) { - mGlobalProxy = proxyProperties; + synchronized (mProxyTracker.mProxyLock) { + mProxyTracker.mGlobalProxy = proxyProperties; } } } @@ -3416,8 +3420,8 @@ public class ConnectivityService extends IConnectivityManager.Stub // so this API change wouldn't have a benefit. It also breaks the passing // of proxy info to all the JVMs. // enforceAccessPermission(); - synchronized (mProxyLock) { - return mGlobalProxy; + synchronized (mProxyTracker.mProxyLock) { + return mProxyTracker.mGlobalProxy; } } @@ -3426,9 +3430,11 @@ public class ConnectivityService extends IConnectivityManager.Stub && Uri.EMPTY.equals(proxy.getPacFileUrl())) { proxy = null; } - synchronized (mProxyLock) { - if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return; - if (mDefaultProxy == proxy) return; // catches repeated nulls + synchronized (mProxyTracker.mProxyLock) { + if (mProxyTracker.mDefaultProxy != null && mProxyTracker.mDefaultProxy.equals(proxy)) { + return; + } + if (mProxyTracker.mDefaultProxy == proxy) return; // catches repeated nulls if (proxy != null && !proxy.isValid()) { if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString()); return; @@ -3439,17 +3445,17 @@ public class ConnectivityService extends IConnectivityManager.Stub // global (to get the correct local port), and send a broadcast. // TODO: Switch PacManager to have its own message to send back rather than // reusing EVENT_HAS_CHANGED_PROXY and this call to handleApplyDefaultProxy. - if ((mGlobalProxy != null) && (proxy != null) + if ((mProxyTracker.mGlobalProxy != null) && (proxy != null) && (!Uri.EMPTY.equals(proxy.getPacFileUrl())) - && proxy.getPacFileUrl().equals(mGlobalProxy.getPacFileUrl())) { - mGlobalProxy = proxy; - sendProxyBroadcast(mGlobalProxy); + && proxy.getPacFileUrl().equals(mProxyTracker.mGlobalProxy.getPacFileUrl())) { + mProxyTracker.mGlobalProxy = proxy; + sendProxyBroadcast(mProxyTracker.mGlobalProxy); return; } - mDefaultProxy = proxy; + mProxyTracker.mDefaultProxy = proxy; - if (mGlobalProxy != null) return; - if (!mDefaultProxyDisabled) { + if (mProxyTracker.mGlobalProxy != null) return; + if (!mProxyTracker.mDefaultProxyDisabled) { sendProxyBroadcast(proxy); } } @@ -5521,10 +5527,11 @@ public class ConnectivityService extends IConnectivityManager.Stub if (networkAgent.isVPN()) { // Temporarily disable the default proxy (not global). - synchronized (mProxyLock) { - if (!mDefaultProxyDisabled) { - mDefaultProxyDisabled = true; - if (mGlobalProxy == null && mDefaultProxy != null) { + synchronized (mProxyTracker.mProxyLock) { + if (!mProxyTracker.mDefaultProxyDisabled) { + mProxyTracker.mDefaultProxyDisabled = true; + if (mProxyTracker.mGlobalProxy == null + && mProxyTracker.mDefaultProxy != null) { sendProxyBroadcast(null); } } @@ -5550,11 +5557,12 @@ public class ConnectivityService extends IConnectivityManager.Stub } else if (state == NetworkInfo.State.DISCONNECTED) { networkAgent.asyncChannel.disconnect(); if (networkAgent.isVPN()) { - synchronized (mProxyLock) { - if (mDefaultProxyDisabled) { - mDefaultProxyDisabled = false; - if (mGlobalProxy == null && mDefaultProxy != null) { - sendProxyBroadcast(mDefaultProxy); + synchronized (mProxyTracker.mProxyLock) { + if (mProxyTracker.mDefaultProxyDisabled) { + mProxyTracker.mDefaultProxyDisabled = false; + if (mProxyTracker.mGlobalProxy == null + && mProxyTracker.mDefaultProxy != null) { + sendProxyBroadcast(mProxyTracker.mDefaultProxy); } } } diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java new file mode 100644 index 0000000000..1b2dd5e721 --- /dev/null +++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2018, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.connectivity; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.ProxyInfo; + +import com.android.internal.annotations.GuardedBy; + +/** + * A class to handle proxy for ConnectivityService. + * + * @hide + */ +public class ProxyTracker { + // TODO : make this private and import as much managing logic from ConnectivityService as + // possible + @NonNull + public final Object mProxyLock = new Object(); + @Nullable + @GuardedBy("mProxyLock") + public ProxyInfo mGlobalProxy = null; + @Nullable + @GuardedBy("mProxyLock") + public volatile ProxyInfo mDefaultProxy = null; + @GuardedBy("mProxyLock") + public boolean mDefaultProxyDisabled = false; +}