LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update ConnectivityManager javadoc"

Browse Source
This commit is contained in:
Sherri Lin
2023-03-07 16:50:15 +00:00
committed by Gerrit Code Review
parent 8eae7f2679 443b7182a6
commit 9e8162c6e0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/android/net/ConnectivityManager.java
View File

@@ -2521,7 +2521,7 @@ public class ConnectivityManager {
@RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD)
public @NonNull SocketKeepalive createSocketKeepalive(@NonNull Network network, public @NonNull SocketKeepalive createSocketKeepalive(@NonNull Network network,
@NonNull Socket socket, @NonNull Socket socket,
@NonNull Executor executor, @NonNull @CallbackExecutor Executor executor,
@NonNull Callback callback) { @NonNull Callback callback) {
ParcelFileDescriptor dup; ParcelFileDescriptor dup;
try { try {
@@ -5494,9 +5494,9 @@ public class ConnectivityManager {
* @return {@code uid} if the connection is found and the app has permission to observe it * @return {@code uid} if the connection is found and the app has permission to observe it
* (e.g., if it is associated with the calling VPN app's VpnService tunnel) or {@link * (e.g., if it is associated with the calling VPN app's VpnService tunnel) or {@link
* android.os.Process#INVALID_UID} if the connection is not found. * android.os.Process#INVALID_UID} if the connection is not found.
* @throws {@link SecurityException} if the caller is not the active VpnService for the current * @throws SecurityException if the caller is not the active VpnService for the current
* user. * user.
* @throws {@link IllegalArgumentException} if an unsupported protocol is requested. * @throws IllegalArgumentException if an unsupported protocol is requested.
*/ */
public int getConnectionOwnerUid( public int getConnectionOwnerUid(
int protocol, @NonNull InetSocketAddress local, @NonNull InetSocketAddress remote) { int protocol, @NonNull InetSocketAddress local, @NonNull InetSocketAddress remote) {