Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix TetheringIntegrationTests failure" am: 43a219ee83 am: 9f8d61aa60 am: d7514f1781" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-04-08 06:40:48 +00:00
committed by Android (Google) Code Review
parent ec62c13d3d 793bd81792
commit dc64ce7c0d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/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
packages/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();