LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457

Browse Source 
Change-Id: Id9c327f22f44cfb908e70b3031fba7bd9381467b
This commit is contained in:
Paul Hu
2020-04-08 10:00:22 +00:00
committed by Automerger Merge Worker
parent 4cea68cf9c b33911c19c
commit 231005897e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tethering/tests/integration/Android.bp
View File

@@ -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",
],
} }

2
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

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