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

Commit f626b8a5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix TetheringIntegrationTests failure" am: 43a219ee am:... 

Merge "Merge "Fix TetheringIntegrationTests failure" am: 43a219ee am: 9f8d61aa am: d7514f17" into rvc-d1-dev-plus-aosp am: dc64ce7c am: 5f40a70e

Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
parents 7dc49d0f 5f40a70e

packages/Tethering/tests/integration/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -39,4 +39,9 @@ android_test { 
        "android.test.base",

        "android.test.base",

        "android.test.mock",

        "android.test.mock",

    ],

    ],

    jni_libs: [

        // For mockito extended

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],

}
 
}

packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -205,7 +205,7 @@ public class EthernetTetheringTest { 
                requestWithStaticIpv4(localAddr, clientAddr));

                requestWithStaticIpv4(localAddr, clientAddr));





        mTetheringEventCallback.awaitInterfaceTethered();

        mTetheringEventCallback.awaitInterfaceTethered();

        assertInterfaceHasIpAddress(iface, clientAddr);

        assertInterfaceHasIpAddress(iface, localAddr);





        byte[] client1 = MacAddress.fromString("1:2:3:4:5:6").toByteArray();

        byte[] client1 = MacAddress.fromString("1:2:3:4:5:6").toByteArray();

        byte[] client2 = MacAddress.fromString("a:b:c:d:e:f").toByteArray();

        byte[] client2 = MacAddress.fromString("a:b:c:d:e:f").toByteArray();