commit 31558edb8e59d361557e01a5271437d3545fade6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 12 08:57:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 12 08:57:55 2021 +0000
tree 573f28390d900be10cb4b5e52557ad856159c432
parent 0a30c831a4367fc567a9167e64337420a8e04edb
parent 642d6abe9d4b5ab398e8a349595d84ebc320025c

Merge "Remove hidden INVALID_RESOURCE_ID in unused param"

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index e9107b6..8c66db9 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/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 @@
             dup = createInvalidFd();
         }
         return new NattSocketKeepalive(mService, network, dup,
-                INVALID_RESOURCE_ID /* Unused */, source, destination, executor, callback);
+                -1 /* Unused */, source, destination, executor, callback);
     }
 
     /**