Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev (544e00d3) · Commits · e / os / android_frameworks_base

core/java/android/net/util/KeepaliveUtils.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -34,9 +34,6 @@ public final class KeepaliveUtils {

		public static final String TAG = "KeepaliveUtils";

		// Minimum supported keepalive count per transport if the network supports keepalive.
		public static final int MIN_SUPPORTED_KEEPALIVE_COUNT = 3;

		public static class KeepaliveDeviceConfigurationException extends AndroidRuntimeException {
		public KeepaliveDeviceConfigurationException(final String msg) {
		super(msg);
		@@ -84,10 +81,7 @@ public final class KeepaliveUtils {
		throw new KeepaliveDeviceConfigurationException("Invalid transport " + transport);
		}

		// Customized values should be either 0 to indicate the network doesn't support
		// keepalive offload, or a positive value that is at least
		// MIN_SUPPORTED_KEEPALIVE_COUNT if supported.
		if (supported != 0 && supported < MIN_SUPPORTED_KEEPALIVE_COUNT) {
		if (supported < 0) {
		throw new KeepaliveDeviceConfigurationException(
		"Invalid supported count " + supported + " for "
		+ NetworkCapabilities.transportNameOf(transport));

+1 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,7 @@ public class KeepaliveTracker {
		if (KeepaliveInfo.STARTING == ki.mStartedState) {
		if (SUCCESS == reason) {
		// Keepalive successfully started.
		if (DBG) Log.d(TAG, "Started keepalive " + slot + " on " + nai.name());
		Log.d(TAG, "Started keepalive " + slot + " on " + nai.name());
		ki.mStartedState = KeepaliveInfo.STARTED;
		try {
		ki.mCallback.onStarted(slot);

+0 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ class KeepaliveUtilsTest {
		assertRunWithException(arrayOf("5"))

		// Check resource with invalid slots value.
		assertRunWithException(arrayOf("2,2"))
		assertRunWithException(arrayOf("3,-1"))

		// Check resource with invalid transport type.