Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9452d2 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Make IpClientIntegrationTest pass on rvc-dev." into rvc-dev am: 5d74a29e

Change-Id: I8ae7080bdd43fd6d276773582a36e367c43d9f4b
parents 52e7aac6 5d74a29e
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -407,7 +407,13 @@ public class IpClientIntegrationTest {
        mPacketReaderThread.start();
        mHandler = mPacketReaderThread.getThreadHandler();

        mTapFd = iface.getFileDescriptor().getFileDescriptor();
        // Detach the FileDescriptor from the ParcelFileDescriptor.
        // Otherwise, the garbage collector might call the ParcelFileDescriptor's finalizer, which
        // closes the FileDescriptor and destroys our tap interface. An alternative would be to
        // make the ParcelFileDescriptor or the TestNetworkInterface a class member so they never
        // go out of scope.
        mTapFd = new FileDescriptor();
        mTapFd.setInt$(iface.getFileDescriptor().detachFd());
        mPacketReader = new TapPacketReader(mHandler, mTapFd, DATA_BUFFER_LEN);
        mHandler.post(() -> mPacketReader.start());
    }