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

Merge "Dup fds to stop finalizers from invalidating them."

Browse Source
This commit is contained in:
Lorenzo Colitti
2017-03-16 03:27:13 +00:00
committed by Gerrit Code Review
parent 154dea6b60 a7ec8300d9
commit d7a02820ac
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/cts/hostside/app/src/com/android/cts/net/hostside/RemoteSocketFactoryClient.java
View File

@@ -22,11 +22,15 @@ import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.IBinder; import android.os.IBinder;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.system.ErrnoException;
import android.system.Os;
import com.android.cts.net.hostside.IRemoteSocketFactory; import com.android.cts.net.hostside.IRemoteSocketFactory;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException;
public class RemoteSocketFactoryClient { public class RemoteSocketFactoryClient {
private static final int TIMEOUT_MS = 5000; private static final int TIMEOUT_MS = 5000;
@@ -76,9 +80,14 @@ public class RemoteSocketFactoryClient {
} }
} }
public FileDescriptor openSocketFd( public FileDescriptor openSocketFd(String host, int port, int timeoutMs)
String host, int port, int timeoutMs) throws RemoteException { throws RemoteException, ErrnoException, IOException {
return mService.openSocketFd(host, port, timeoutMs).getFileDescriptor(); // Dup the filedescriptor so ParcelFileDescriptor's finalizer doesn't garbage collect it
// and cause our fd to become invalid. http://b/35927643 .
ParcelFileDescriptor pfd = mService.openSocketFd(host, port, timeoutMs);
FileDescriptor fd = Os.dup(pfd.getFileDescriptor());
pfd.close();
return fd;
} }
public String getPackageName() throws RemoteException { public String getPackageName() throws RemoteException {

10
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -481,7 +481,11 @@ public class VpnTest extends InstrumentationTestCase {
private FileDescriptor openSocketFd(String host, int port, int timeoutMs) throws Exception { private FileDescriptor openSocketFd(String host, int port, int timeoutMs) throws Exception {
Socket s = new Socket(host, port); Socket s = new Socket(host, port);
s.setSoTimeout(timeoutMs); s.setSoTimeout(timeoutMs);
return ParcelFileDescriptor.fromSocket(s).getFileDescriptor(); // Dup the filedescriptor so ParcelFileDescriptor's finalizer doesn't garbage collect it
// and cause our fd to become invalid. http://b/35927643 .
FileDescriptor fd = Os.dup(ParcelFileDescriptor.fromSocket(s).getFileDescriptor());
s.close();
return fd;
} }
private FileDescriptor openSocketFdInOtherApp( private FileDescriptor openSocketFdInOtherApp(
@@ -511,7 +515,9 @@ public class VpnTest extends InstrumentationTestCase {
private void assertSocketStillOpen(FileDescriptor fd, String host) throws Exception { private void assertSocketStillOpen(FileDescriptor fd, String host) throws Exception {
try { try {
assertTrue(fd.valid());
sendRequest(fd, host); sendRequest(fd, host);
assertTrue(fd.valid());
} finally { } finally {
Os.close(fd); Os.close(fd);
} }
@@ -519,10 +525,12 @@ public class VpnTest extends InstrumentationTestCase {
private void assertSocketClosed(FileDescriptor fd, String host) throws Exception { private void assertSocketClosed(FileDescriptor fd, String host) throws Exception {
try { try {
assertTrue(fd.valid());
sendRequest(fd, host); sendRequest(fd, host);
fail("Socket opened before VPN connects should be closed when VPN connects"); fail("Socket opened before VPN connects should be closed when VPN connects");
} catch (ErrnoException expected) { } catch (ErrnoException expected) {
assertEquals(ECONNABORTED, expected.errno); assertEquals(ECONNABORTED, expected.errno);
assertTrue(fd.valid());
} finally { } finally {
Os.close(fd); Os.close(fd);
} }