Merge "Correct value of supported keepalive count for cellular" am: 7423873ac8

am: 056eeae27c

Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
This commit is contained in:
Junyu Lai
2019-06-19 07:28:53 -07:00
committed by android-build-merger

View File

@@ -44,9 +44,11 @@ import java.util.concurrent.Executor;
* {@link SocketKeepalive.Callback#onStopped} if the operation was successful or * {@link SocketKeepalive.Callback#onStopped} if the operation was successful or
* {@link SocketKeepalive.Callback#onError} if an error occurred. * {@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 * {@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 { public abstract class SocketKeepalive implements AutoCloseable {
static final String TAG = "SocketKeepalive"; static final String TAG = "SocketKeepalive";