Merge "Remove hidden INVALID_RESOURCE_ID in unused param"
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
package android.net;
|
package android.net;
|
||||||
|
|
||||||
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
|
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.BACKGROUND_REQUEST;
|
||||||
import static android.net.NetworkRequest.Type.LISTEN;
|
import static android.net.NetworkRequest.Type.LISTEN;
|
||||||
import static android.net.NetworkRequest.Type.REQUEST;
|
import static android.net.NetworkRequest.Type.REQUEST;
|
||||||
@@ -2006,7 +2005,7 @@ public class ConnectivityManager {
|
|||||||
dup = createInvalidFd();
|
dup = createInvalidFd();
|
||||||
}
|
}
|
||||||
return new NattSocketKeepalive(mService, network, dup,
|
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