Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: de66768a6c am: 21c40a1905 am: 2e5256b1a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user