IpConnectivityMetrics: no metrics upload in tests (ae048d83) · Commits · e / os / android_frameworks_base

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

+9 −1

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

	private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();		private final IpConnectivityLog mMetricsLog;

	/**		/**
	* Implements support for the legacy "one network per network type" model.		* Implements support for the legacy "one network per network type" model.
	@@ -677,8 +677,16 @@ public class ConnectivityService extends IConnectivityManager.Stub

	public ConnectivityService(Context context, INetworkManagementService netManager,		public ConnectivityService(Context context, INetworkManagementService netManager,
	INetworkStatsService statsService, INetworkPolicyManager policyManager) {		INetworkStatsService statsService, INetworkPolicyManager policyManager) {
			this(context, netManager, statsService, policyManager, new IpConnectivityLog());
			}

			@VisibleForTesting
			protected ConnectivityService(Context context, INetworkManagementService netManager,
			INetworkStatsService statsService, INetworkPolicyManager policyManager,
			IpConnectivityLog logger) {
	if (DBG) log("ConnectivityService starting up");		if (DBG) log("ConnectivityService starting up");

			mMetricsLog = logger;
	mDefaultRequest = createInternetRequestForTransport(-1);		mDefaultRequest = createInternetRequestForTransport(-1);
	NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());		NetworkRequestInfo defaultNRI = new NetworkRequestInfo(null, mDefaultRequest, new Binder());
	mNetworkRequests.put(mDefaultRequest, defaultNRI);		mNetworkRequests.put(mDefaultRequest, defaultNRI);

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -200,7 +200,7 @@ public class NetworkMonitor extends StateMachine {
	private final WifiManager mWifiManager;		private final WifiManager mWifiManager;
	private final AlarmManager mAlarmManager;		private final AlarmManager mAlarmManager;
	private final NetworkRequest mDefaultRequest;		private final NetworkRequest mDefaultRequest;
	private final IpConnectivityLog mMetricsLog = new IpConnectivityLog();		private final IpConnectivityLog mMetricsLog;

	private boolean mIsCaptivePortalCheckEnabled;		private boolean mIsCaptivePortalCheckEnabled;
	private boolean mUseHttps;		private boolean mUseHttps;
	@@ -226,10 +226,17 @@ public class NetworkMonitor extends StateMachine {

	public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,		public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,
	NetworkRequest defaultRequest) {		NetworkRequest defaultRequest) {
			this(context, handler, networkAgentInfo, defaultRequest, new IpConnectivityLog());
			}

			@VisibleForTesting
			protected NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo,
			NetworkRequest defaultRequest, IpConnectivityLog logger) {
	// Add suffix indicating which NetworkMonitor we're talking about.		// Add suffix indicating which NetworkMonitor we're talking about.
	super(TAG + networkAgentInfo.name());		super(TAG + networkAgentInfo.name());

	mContext = context;		mContext = context;
			mMetricsLog = logger;
	mConnectivityServiceHandler = handler;		mConnectivityServiceHandler = handler;
	mNetworkAgentInfo = networkAgentInfo;		mNetworkAgentInfo = networkAgentInfo;
	mNetId = mNetworkAgentInfo.network.netId;		mNetId = mNetworkAgentInfo.network.netId;

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,7 @@ import android.net.NetworkInfo.DetailedState;
	import android.net.NetworkMisc;		import android.net.NetworkMisc;
	import android.net.NetworkRequest;		import android.net.NetworkRequest;
	import android.net.RouteInfo;		import android.net.RouteInfo;
			import android.net.metrics.IpConnectivityLog;
	import android.os.ConditionVariable;		import android.os.ConditionVariable;
	import android.os.Handler;		import android.os.Handler;
	import android.os.HandlerThread;		import android.os.HandlerThread;
	@@ -585,8 +586,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
	public String gen204ProbeRedirectUrl = null;		public String gen204ProbeRedirectUrl = null;

	public WrappedNetworkMonitor(Context context, Handler handler,		public WrappedNetworkMonitor(Context context, Handler handler,
	NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest) {		NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest,
	super(context, handler, networkAgentInfo, defaultRequest);		IpConnectivityLog log) {
			super(context, handler, networkAgentInfo, defaultRequest, log);
	}		}

	@Override		@Override
	@@ -599,8 +601,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
	private WrappedNetworkMonitor mLastCreatedNetworkMonitor;		private WrappedNetworkMonitor mLastCreatedNetworkMonitor;

	public WrappedConnectivityService(Context context, INetworkManagementService netManager,		public WrappedConnectivityService(Context context, INetworkManagementService netManager,
	INetworkStatsService statsService, INetworkPolicyManager policyManager) {		INetworkStatsService statsService, INetworkPolicyManager policyManager,
	super(context, netManager, statsService, policyManager);		IpConnectivityLog log) {
			super(context, netManager, statsService, policyManager, log);
	mLingerDelayMs = TEST_LINGER_DELAY_MS;		mLingerDelayMs = TEST_LINGER_DELAY_MS;
	}		}

	@@ -639,8 +642,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
	@Override		@Override
	public NetworkMonitor createNetworkMonitor(Context context, Handler handler,		public NetworkMonitor createNetworkMonitor(Context context, Handler handler,
	NetworkAgentInfo nai, NetworkRequest defaultRequest) {		NetworkAgentInfo nai, NetworkRequest defaultRequest) {
	final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(context, handler, nai,		final WrappedNetworkMonitor monitor = new WrappedNetworkMonitor(
	defaultRequest);		context, handler, nai, defaultRequest, mock(IpConnectivityLog.class));
	mLastCreatedNetworkMonitor = monitor;		mLastCreatedNetworkMonitor = monitor;
	return monitor;		return monitor;
	}		}
	@@ -705,7 +708,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
	mService = new WrappedConnectivityService(mServiceContext,		mService = new WrappedConnectivityService(mServiceContext,
	mock(INetworkManagementService.class),		mock(INetworkManagementService.class),
	mock(INetworkStatsService.class),		mock(INetworkStatsService.class),
	mock(INetworkPolicyManager.class));		mock(INetworkPolicyManager.class),
			mock(IpConnectivityLog.class));

	mService.systemReady();		mService.systemReady();
	mCm = new WrappedConnectivityManager(getContext(), mService);		mCm = new WrappedConnectivityManager(getContext(), mService);