Merge "Reduce redundant network probing and prevent probing loop" am: d22d5b2870 (2400b3b0) · Commits · e / os / android_packages_modules_NetworkStack

src/com/android/networkstack/netlink/TcpSocketTracker.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -311,7 +311,7 @@ public class TcpSocketTracker {
	}		}
	}		}
	final SocketInfo info = new SocketInfo(tcpInfo, family, mark, time);		final SocketInfo info = new SocketInfo(tcpInfo, family, mark, time);
	log("pollSocketsInfo, " + info);		log("parseSockInfo, " + info);
	return info;		return info;
	}		}

src/com/android/server/connectivity/NetworkMonitor.java

+17 −6

Original line number	Original line	Diff line number	Diff line
	@@ -752,9 +752,20 @@ public class NetworkMonitor extends StateMachine {
	}		}
	mEvaluationState.reportEvaluationResult(result, null /* redirectUrl */);		mEvaluationState.reportEvaluationResult(result, null /* redirectUrl */);
	mValidations++;		mValidations++;
			initSocketTrackingIfRequired();
			// start periodical polling.
	sendTcpPollingEvent();		sendTcpPollingEvent();
	}		}

			private void initSocketTrackingIfRequired() {
			if (!isValidationRequired()) return;

			final TcpSocketTracker tst = getTcpSocketTracker();
			if (tst != null) {
			tst.pollSocketsInfo();
			}
			}

	@Override		@Override
	public boolean processMessage(Message message) {		public boolean processMessage(Message message) {
	switch (message.what) {		switch (message.what) {
	@@ -2229,7 +2240,7 @@ public class NetworkMonitor extends StateMachine {
	@VisibleForTesting		@VisibleForTesting
	protected boolean isDataStall() {		protected boolean isDataStall() {
	Boolean result = null;		Boolean result = null;
	final StringJoiner msg = VDBG_STALL ? new StringJoiner(", ") : null;		final StringJoiner msg = (DBG \|\| VDBG_STALL) ? new StringJoiner(", ") : null;
	// Reevaluation will generate traffic. Thus, set a minimal reevaluation timer to limit the		// Reevaluation will generate traffic. Thus, set a minimal reevaluation timer to limit the
	// possible traffic cost in metered network.		// possible traffic cost in metered network.
	if (!mNetworkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED)		if (!mNetworkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED)
	@@ -2247,9 +2258,9 @@ public class NetworkMonitor extends StateMachine {
	} else if (tst.isDataStallSuspected()) {		} else if (tst.isDataStallSuspected()) {
	result = true;		result = true;
	}		}
	if (VDBG_STALL) {		if (DBG \|\| VDBG_STALL) {
	msg.add("tcp packets received=" + tst.getLatestReceivedCount())		msg.add("tcp packets received=" + tst.getLatestReceivedCount())
	.add("tcp fail rate=" + tst.getLatestPacketFailPercentage());		.add("latest tcp fail rate=" + tst.getLatestPacketFailPercentage());
	}		}
	}		}

	@@ -2262,13 +2273,13 @@ public class NetworkMonitor extends StateMachine {
	result = true;		result = true;
	logNetworkEvent(NetworkEvent.NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND);		logNetworkEvent(NetworkEvent.NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND);
	}		}
	if (VDBG_STALL) {		if (DBG \|\| VDBG_STALL) {
	msg.add("consecutive dns timeout count="		msg.add("consecutive dns timeout count="
	+ mDnsStallDetector.getConsecutiveTimeoutCount());		+ mDnsStallDetector.getConsecutiveTimeoutCount());
	}		}
	}		}
			// log only data stall suspected.
	if (VDBG_STALL) {		if ((DBG && Boolean.TRUE.equals(result)) \|\| VDBG_STALL) {
	log("isDataStall: result=" + result + ", " + msg);		log("isDataStall: result=" + result + ", " + msg);
	}		}