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

Commit 8181ca51 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip testPhysicalEthernet if the test run adb over network" am: 349c5720 

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

Change-Id: I0d6eb8195743a6318c5adabb26d837ae35236c0d
parents 7a42f1c9 349c5720

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

+11 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.net.dhcp.DhcpPacket; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.system.Os;

import android.util.Log;
@@ -224,9 +225,19 @@ public class EthernetTetheringTest { 


    }



    private boolean isAdbOverNetwork() {

        // If adb TCP port opened, this test may running by adb over network.

        return (SystemProperties.getInt("persist.adb.tcp.port", -1) > -1)

                || (SystemProperties.getInt("service.adb.tcp.port", -1) > -1);

    }



    @Test

    public void testPhysicalEthernet() throws Exception {

        assumeTrue(mEm.isAvailable());

        // Do not run this test if adb is over network and ethernet is connected.

        // It is likely the adb run over ethernet, the adb would break when ethernet is switching

        // from client mode to server mode. See b/160389275.

        assumeFalse(isAdbOverNetwork());



        // Get an interface to use.

        final String iface = mTetheredInterfaceRequester.getInterface();