LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev

Browse Source
This commit is contained in:
Junyu Lai
2019-06-20 05:35:07 +00:00
committed by Android (Google) Code Review
parent 03e193c8a7 ca8b6ed19f
commit e660a0a7e2
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/util/KeepaliveUtils.java
View File

@@ -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));

2
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -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);

1
tests/net/java/android/net/util/KeepaliveUtilsTest.kt
View File

@@ -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.