diff --git a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java index 69eb58f84b..007bf23a1c 100644 --- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java +++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java @@ -215,6 +215,13 @@ public abstract class EthernetTetheringTestBase { } } + protected void stopEthernetTethering(final MyTetheringEventCallback callback) { + runAsShell(TETHER_PRIVILEGED, () -> { + mTm.stopTethering(TETHERING_ETHERNET); + maybeUnregisterTetheringEventCallback(callback); + }); + } + protected void cleanUp() throws Exception { setPreferTestNetworks(false); diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java index 12ac454f13..55854e273f 100644 --- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java +++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java @@ -364,7 +364,7 @@ public class EthernetTetheringTest extends EthernetTetheringTestBase { // Enable Ethernet tethering and check that it starts. tetheringEventCallback = enableEthernetTethering(iface, null /* any upstream */); } finally { - maybeUnregisterTetheringEventCallback(tetheringEventCallback); + stopEthernetTethering(tetheringEventCallback); } // There is nothing more we can do on a physical interface without connecting an actual // client, which is not possible in this test.