Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb

Change-Id: Icde8ef078ec5ebde8d9c978432a9aa12b7a1e3a9
This commit is contained in:
Paul Hu
2020-04-08 06:40:20 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 1 deletions

View File

@@ -39,4 +39,9 @@ android_test {
"android.test.base",
"android.test.mock",
],
jni_libs: [
// For mockito extended
"libdexmakerjvmtiagent",
"libstaticjvmtiagent",
],
}

View File

@@ -205,7 +205,7 @@ public class EthernetTetheringTest {
requestWithStaticIpv4(localAddr, clientAddr));
mTetheringEventCallback.awaitInterfaceTethered();
assertInterfaceHasIpAddress(iface, clientAddr);
assertInterfaceHasIpAddress(iface, localAddr);
byte[] client1 = MacAddress.fromString("1:2:3:4:5:6").toByteArray();
byte[] client2 = MacAddress.fromString("a:b:c:d:e:f").toByteArray();