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

Commit 68a4599a authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "Correct value of supported keepalive count for cellular"

parents 3647eb62 c0de2838

core/java/android/net/SocketKeepalive.java

+4 −2
Original line number Diff line number Diff line
@@ -44,9 +44,11 @@ import java.util.concurrent.Executor; 
 * {@link SocketKeepalive.Callback#onStopped} if the operation was successful or

 * {@link SocketKeepalive.Callback#onError} if an error occurred.

 *

 * The device SHOULD support keepalive offload. If it does not, it MUST reply with

 * For cellular, the device MUST support at least 1 keepalive slot.

 *

 * For WiFi, the device SHOULD support keepalive offload. If it does not, it MUST reply with

 * {@link SocketKeepalive.Callback#onError} with {@code ERROR_UNSUPPORTED} to any keepalive offload

 * request. If it does, it MUST support at least 3 concurrent keepalive slots per transport.

 * request. If it does, it MUST support at least 3 concurrent keepalive slots.

 */

public abstract class SocketKeepalive implements AutoCloseable {

    static final String TAG = "SocketKeepalive";

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ 
         overridden by the device to present the capability of creating socket keepalives. -->

    <!-- An Array of "[NetworkCapabilities.TRANSPORT_*],[supported keepalives] -->

    <string-array translatable="false" name="config_networkSupportedKeepaliveCount">

        <item>0,3</item>

        <item>0,1</item>

        <item>1,3</item>

    </string-array>