Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 241609e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I55b776ef0ae16d0a762f10c979e1efb659200ad8
parents 981cdf9e e6317e5c

packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

+9 −5
Original line number Diff line number Diff line
@@ -102,17 +102,21 @@ public class EthernetTetheringTest { 


    private UiAutomation mUiAutomation =

            InstrumentationRegistry.getInstrumentation().getUiAutomation();

    private boolean mRunTests;



    @Before

    public void setUp() throws Exception {

        mHandlerThread = new HandlerThread(getClass().getSimpleName());

        mHandlerThread.start();

        mHandler = new Handler(mHandlerThread.getLooper());

        mTetheredInterfaceRequester = new TetheredInterfaceRequester(mHandler, mEm);

        // Needed to create a TestNetworkInterface, to call requestTetheredInterface, and to receive

        // tethered client callbacks.

        mUiAutomation.adoptShellPermissionIdentity(

                MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED);

        mRunTests = mTm.isTetheringSupported() && mEm != null;

        assumeTrue(mRunTests);



        mHandlerThread = new HandlerThread(getClass().getSimpleName());

        mHandlerThread.start();

        mHandler = new Handler(mHandlerThread.getLooper());

        mTetheredInterfaceRequester = new TetheredInterfaceRequester(mHandler, mEm);

    }



    private void cleanUp() throws Exception {
@@ -136,7 +140,7 @@ public class EthernetTetheringTest { 
    @After

    public void tearDown() throws Exception {

        try {

            cleanUp();

            if (mRunTests) cleanUp();

        } finally {

            mUiAutomation.dropShellPermissionIdentity();

        }