joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Make change and version bump to r_aml_300900700 for mainline module file: packages/Tethering/apex/manifest.json

Browse source 
Change-Id: Ieed62e845451de7c90a0f71a21289003e5ea8b72
This commit is contained in:
android-build-team Robot 2020-07-09 03:09:32 +00:00
commit 8e291dea63
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tethering/apex/manifest.json
View file

@ -1,4 +1,4 @@
{
"name": "com.android.tethering",
"version": 300900600
"version": 300900700
}

11
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View file

@ -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();