diff options
| author | 2021-03-12 10:00:28 +0000 | |
|---|---|---|
| committer | 2021-03-12 10:00:28 +0000 | |
| commit | 2e5256b1a2976be44adbe5c2d758a79bc1ba2f56 (patch) | |
| tree | 7efd7e25a9fd60d5e80f05e98d25aff0bf6279ba | |
| parent | bb09bdec9425260f86078b7a2125e80057f480fc (diff) | |
| parent | 88b6a466859b2259c6628a00c5cd5a82ea87452f (diff) | |
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2a8 am: 88b6a46685
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24c665e10814ddf46005fa84ea12cbd4e4e22369
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/ConnectivityManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java index e9107b67e4ef..8c66db9a205a 100644 --- a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java +++ b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java @@ -16,7 +16,6 @@ package android.net; import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; -import static android.net.IpSecManager.INVALID_RESOURCE_ID; import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST; import static android.net.NetworkRequest.Type.LISTEN; import static android.net.NetworkRequest.Type.REQUEST; @@ -2006,7 +2005,7 @@ public class ConnectivityManager { dup = createInvalidFd(); } return new NattSocketKeepalive(mService, network, dup, - INVALID_RESOURCE_ID /* Unused */, source, destination, executor, callback); + -1 /* Unused */, source, destination, executor, callback); } /** |