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

Commit 5444ade8 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Paul Hu
Browse files

Fix TetheringIntegrationTests failure 

Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
Merged-In: I5a537eca9b1aab3694a11a2dab147a31f289314c
(cherry picked from commit f626b8a5)
parent 8f19a55f

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();