Merge "Switch the adb-over-ip check to an existing method"
diff --git a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
index 73c3b33..7441149 100644
--- a/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
+++ b/tests/benchmark_hostside/java/android/avf/test/AVFHostTestCase.java
@@ -488,8 +488,7 @@
// different serial for fastboot. But there's no good way to distinguish from regular IP
// transport. This is currently not a problem until someone really needs to run the test
// over regular IP transport.
- boolean isAdbOverIp = getDevice().getSerialNumber().contains(":");
- assumeFalse("Skip over IP (overkill for remote_device_proxy)", isAdbOverIp);
+ assumeFalse("Skip over IP (overkill for remote_device_proxy)", getDevice().isAdbTcp());
if (!getDevice().isStateBootloaderOrFastbootd()) {
getDevice().rebootIntoBootloader();