Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c06b5e authored by Junyu Lai's avatar Junyu Lai
Browse files

Move the test of minimum supported keepalive slots to CTS 

This change also enables log when keepalive is started.

Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest FrameworksNetTests
Merged-In: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1
Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9
(cherry picked from commit aed835f0)
parent ddaa6e59

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

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

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

tests/net/java/android/net/util/KeepaliveUtilsTest.kt

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