Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct value of supported keepalive count for cellular"

Browse Source
This commit is contained in:
Junyu Lai
2019-06-19 14:08:31 +00:00
committed by Gerrit Code Review
parent 3647eb620b c0de2838e7
commit 68a4599a37
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/SocketKeepalive.java
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";

2
core/res/res/values/config.xml
View File

@@ -353,7 +353,7 @@
overridden by the device to present the capability of creating socket keepalives. --> overridden by the device to present the capability of creating socket keepalives. -->
<!-- An Array of "[NetworkCapabilities.TRANSPORT_*],[supported keepalives] --> <!-- An Array of "[NetworkCapabilities.TRANSPORT_*],[supported keepalives] -->
<string-array translatable="false" name="config_networkSupportedKeepaliveCount"> <string-array translatable="false" name="config_networkSupportedKeepaliveCount">
<item>0,3</item> <item>0,1</item>
<item>1,3</item> <item>1,3</item>
</string-array> </string-array>