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

Commit f5dfad4b authored by Jeff Vander Stoep's avatar Jeff Vander Stoep
Browse files

InetDiagSocketTest: enable UDP unit tests on all devices 

Bug: 116849885
Test: atest InetDiagSocketTest
Change-Id: I3b036818cccd0959feb3a93bc722d70e3ef2c4d7
parent d7fe73d3

tests/net/java/android/net/netlink/InetDiagSocketTest.java

+0 −10
Original line number Diff line number Diff line
@@ -69,17 +69,12 @@ public class InetDiagSocketTest { 
    private ConnectivityManager mCm;

    private Context mContext;

    private final static int SOCKET_TIMEOUT_MS = 100;

    private boolean mInetDiagUdpEnabled;



    @Before

    public void setUp() throws Exception {

        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();

        mContext = instrumentation.getTargetContext();

        mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);

        int expectedUid = Process.myUid();

        UdpConnection udp = new UdpConnection("127.0.0.1", "127.0.0.2");

        int uid = mCm.getConnectionOwnerUid(udp.protocol, udp.local, udp.remote);

        mInetDiagUdpEnabled = (uid == expectedUid);

    }



    private class Connection {
@@ -187,11 +182,6 @@ public class InetDiagSocketTest { 
        checkConnectionOwnerUid(tcp.protocol, tcp.local, new InetSocketAddress(0), false);

        tcp.close();



        /**

         * TODO: STOPSHIP: Always test for UDP, do not allow opt-out.

         */

        if (!mInetDiagUdpEnabled) return;



        /**

         * For UDP connections, either a complete match {protocol, local, remote} or a

         * partial match {protocol, local} should return a valid UID.