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

Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d am: e271f0784f

Browse Source 
Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
This commit is contained in:
Automerger Merge Worker
2020-04-08 07:13:44 +00:00
parent 962210ab79 e271f0784f
commit 2a07469306
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.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));
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();