diff options
| author | Junyu Lai <junyulai@google.com> | 2019-06-19 07:28:53 -0700 |
|---|---|---|
| committer | Junyu Lai <junyulai@google.com> | 2019-06-20 04:02:38 +0000 |
| commit | a248130fc907ab78934eaeecc6cd0a486bd824ec (patch) | |
| tree | c0ce6ad846c1773d1511df4e02623a940a9d929e /core/java/android | |
| parent | ddaa6e5943f36e5d44b4567b93cde8faf0545907 (diff) | |
Correct value of supported keepalive count for cellular
Cellular only supports 1 keepalive connection so correct the default
supported value to 1.
Bug: 134037217
Bug: 134352656
Test: - atest FrameworksNetTests
- atest android.net.cts.ConnectivityManagerTest \
#testSocketKeepaliveLimitTelephony
Merged-In: Ia3761f2e78d54866bb2e156d58004396bbc8adc3
Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
(cherry picked from commit 680abbb591d9c084d1a1e3f9dea1ed8d4e3b1ae8)
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"; |