From b33911c19c272866866689f2a1be849fd2cc4164 Mon Sep 17 00:00:00 2001
From: Automerger Merge Worker
 <android-build-automerger-merge-worker@system.gserviceaccount.com>
Date: Wed, 8 Apr 2020 07:13:44 +0000
Subject: [PATCH] Fix TetheringIntegrationTests failure

Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
Merged-In: I5a537eca9b1aab3694a11a2dab147a31f289314c
(cherry picked from commit f626b8a5388746d163600a5eccb60e22cb1071bf)
---
 Tethering/tests/integration/Android.bp                       | 5 +++++
 .../integration/src/android/net/EthernetTetheringTest.java   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Tethering/tests/integration/Android.bp b/Tethering/tests/integration/Android.bp
index 1a1c30d1d5..620261b375 100644
--- a/Tethering/tests/integration/Android.bp
+++ b/Tethering/tests/integration/Android.bp
@@ -39,4 +39,9 @@ android_test {
         "android.test.base",
         "android.test.mock",
     ],
+    jni_libs: [
+        // For mockito extended
+        "libdexmakerjvmtiagent",
+        "libstaticjvmtiagent",
+    ],
 }
diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
index dbd68ef77c..b02bb23f98 100644
--- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
+++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -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();