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

Merge "Replace hidden ParcelFileDescriptor constructor usage"

Browse Source
This commit is contained in:
Chiachang Wang
2021-01-18 01:59:10 +00:00
committed by Gerrit Code Review
parent 67c62a89d9 619319a3f5
commit b1a007e35c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/net/ConnectivityManager.java
View File

@@ -72,7 +72,6 @@ import com.android.internal.util.Protocol;
import libcore.net.event.NetworkEventDispatcher; import libcore.net.event.NetworkEventDispatcher;
import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -1958,6 +1957,12 @@ public class ConnectivityManager {
return k; return k;
} }
// Construct an invalid fd.
private ParcelFileDescriptor createInvalidFd() {
final int invalidFd = -1;
return ParcelFileDescriptor.adoptFd(invalidFd);
}
/** /**
* Request that keepalives be started on a IPsec NAT-T socket. * Request that keepalives be started on a IPsec NAT-T socket.
* *
@@ -1988,7 +1993,7 @@ public class ConnectivityManager {
} catch (IOException ignored) { } catch (IOException ignored) {
// Construct an invalid fd, so that if the user later calls start(), it will fail with // Construct an invalid fd, so that if the user later calls start(), it will fail with
// ERROR_INVALID_SOCKET. // ERROR_INVALID_SOCKET.
dup = new ParcelFileDescriptor(new FileDescriptor()); dup = createInvalidFd();
} }
return new NattSocketKeepalive(mService, network, dup, socket.getResourceId(), source, return new NattSocketKeepalive(mService, network, dup, socket.getResourceId(), source,
destination, executor, callback); destination, executor, callback);
@@ -2030,7 +2035,7 @@ public class ConnectivityManager {
} catch (IOException ignored) { } catch (IOException ignored) {
// Construct an invalid fd, so that if the user later calls start(), it will fail with // Construct an invalid fd, so that if the user later calls start(), it will fail with
// ERROR_INVALID_SOCKET. // ERROR_INVALID_SOCKET.
dup = new ParcelFileDescriptor(new FileDescriptor()); dup = createInvalidFd();
} }
return new NattSocketKeepalive(mService, network, dup, return new NattSocketKeepalive(mService, network, dup,
INVALID_RESOURCE_ID /* Unused */, source, destination, executor, callback); INVALID_RESOURCE_ID /* Unused */, source, destination, executor, callback);
@@ -2067,7 +2072,7 @@ public class ConnectivityManager {
} catch (UncheckedIOException ignored) { } catch (UncheckedIOException ignored) {
// Construct an invalid fd, so that if the user later calls start(), it will fail with // Construct an invalid fd, so that if the user later calls start(), it will fail with
// ERROR_INVALID_SOCKET. // ERROR_INVALID_SOCKET.
dup = new ParcelFileDescriptor(new FileDescriptor()); dup = createInvalidFd();
} }
return new TcpSocketKeepalive(mService, network, dup, executor, callback); return new TcpSocketKeepalive(mService, network, dup, executor, callback);
} }