Skip to content

Commit 5bb61f1

Browse files
author
Sergey Chelombitko
committed
Remove some debug code
1 parent 7a82842 commit 5bb61f1

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

vendor/vendor-android/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/DdmlibDeviceProvider.kt

+1-21
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import java.time.Duration
3636
import java.util.concurrent.ConcurrentHashMap
3737
import java.util.concurrent.ConcurrentMap
3838
import java.util.concurrent.TimeUnit
39-
import java.util.concurrent.atomic.AtomicBoolean
4039

4140
class DdmlibDeviceProvider(
4241
private val track: Track,
@@ -93,29 +92,11 @@ class DdmlibDeviceProvider(
9392
}
9493
}
9594

96-
if (!adb.hasInitialDeviceList() || printStackTraceAfterTimeout { !adb.hasDevices() }) {
95+
if (!adb.hasInitialDeviceList() || !adb.hasDevices()) {
9796
throw NoDevicesException()
9897
}
9998
}
10099

101-
private fun <T> printStackTraceAfterTimeout(block: () -> T): T {
102-
val currentThread = Thread.currentThread()
103-
val isBlockFinished = AtomicBoolean(false)
104-
105-
Thread {
106-
Thread.sleep(PRINT_LOG_TIMEOUT)
107-
if (!isBlockFinished.get() && currentThread.isAlive) {
108-
logger.debug("Task is not finished within timeout. Printing thread stacktrace:", currentThread.stackTrace)
109-
}
110-
}.start()
111-
112-
val result = block()
113-
114-
isBlockFinished.set(true)
115-
116-
return result
117-
}
118-
119100
private fun getDeviceOrPut(androidDevice: DdmlibAndroidDevice): DdmlibAndroidDevice {
120101
val newAndroidDevice = devices.getOrPut(androidDevice.serialNumber) {
121102
androidDevice
@@ -270,6 +251,5 @@ class DdmlibDeviceProvider(
270251
private val ADB_INIT_TIMEOUT = Duration.ofSeconds(60)
271252
private const val DEFAULT_DDM_LIB_TIMEOUT = 30000
272253
private const val DEFAULT_DDM_LIB_SLEEP_TIME = 500L
273-
private const val PRINT_LOG_TIMEOUT = 20000L
274254
}
275255
}

0 commit comments

Comments
 (0)