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

Commit 35c51604 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge "Avoid calling ParcelFileDescriptor.fromSocket on new Sockets."

parents f2c0f4aa 42bd8e1e

tests/net/java/com/android/server/IpSecServiceParameterizedTest.java

+7 −2
Original line number Diff line number Diff line
@@ -535,7 +535,10 @@ public class IpSecServiceParameterizedTest { 


        IpSecTransformResponse createTransformResp =

                mIpSecService.createTransform(ipSecConfig, new Binder(), "blessedPackage");

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());



        Socket socket = new Socket();

        socket.bind(null);

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(socket);



        int resourceId = createTransformResp.resourceId;

        mIpSecService.applyTransportModeTransform(pfd, IpSecManager.DIRECTION_OUT, resourceId);
@@ -552,7 +555,9 @@ public class IpSecServiceParameterizedTest { 


    @Test

    public void testRemoveTransportModeTransform() throws Exception {

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());

        Socket socket = new Socket();

        socket.bind(null);

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(socket);

        mIpSecService.removeTransportModeTransforms(pfd);



        verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd);

tests/net/java/com/android/server/IpSecServiceTest.java

+3 −1
Original line number Diff line number Diff line
@@ -422,7 +422,9 @@ public class IpSecServiceTest { 


    @Test

    public void testRemoveTransportModeTransform() throws Exception {

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(new Socket());

        Socket socket = new Socket();

        socket.bind(null);

        ParcelFileDescriptor pfd = ParcelFileDescriptor.fromSocket(socket);

        mIpSecService.removeTransportModeTransforms(pfd);



        verify(mMockNetd).ipSecRemoveTransportModeTransform(pfd);