diff options
| author | Junyu Lai <junyulai@google.com> | 2019-06-19 07:21:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 07:21:31 -0700 |
| commit | 056eeae27cd6aeef8c2b64f62bca7df48f62e7a4 (patch) | |
| tree | 7c6c7d28a9bcd960d8b5231030507e078d758698 /core/java/android | |
| parent | 36410665678330bdf69d28c526f86cb285fce15d (diff) | |
| parent | 68a4599a37e07745cbe0d441e29152da388b5baa (diff) | |
Merge "Correct value of supported keepalive count for cellular"
am: 68a4599a37
Change-Id: I317b6ec39f94c85c10217ac06f2811f79fa47be2
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/SocketKeepalive.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/SocketKeepalive.java b/core/java/android/net/SocketKeepalive.java index 46eddde968a0..ec73866a647d 100644 --- a/core/java/android/net/SocketKeepalive.java +++ b/core/java/android/net/SocketKeepalive.java @@ -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"; |