Skip to content

Commit 2c41ef7

Browse files
committed
Remove hasInitialDeviceList calls that throw UnsupportedMethodException
1 parent 5318f2b commit 2c41ef7

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

  • src/main/kotlin/com/github/grishberg/androidstudio/plugins

src/main/kotlin/com/github/grishberg/androidstudio/plugins/AdbWrapper.kt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ fun getDebugBridgeWithLogging(project: Project, logger: AppLogger): com.android.
9090
logger.d("Bridge created, checking initial state...")
9191
try {
9292
val isConnected = bridge.isConnected
93-
val hasInitialList = bridge.hasInitialDeviceList()
94-
logger.d("Bridge initial state: isConnected=$isConnected, hasInitialDeviceList=$hasInitialList")
93+
logger.d("Bridge initial state: isConnected=$isConnected")
9594
} catch (t: Throwable) {
9695
logger.e("Failed to get bridge state", t)
9796
}
@@ -127,11 +126,7 @@ class AdbWrapperImpl(private val logger: AppLogger, project: Project) : AdbWrapp
127126
val isConnected = androidBridge.isConnected
128127
logger.d("AdbWrapperImpl.isReady() - isConnected=$isConnected")
129128

130-
logger.d("AdbWrapperImpl.isReady() - checking hasInitialDeviceList()...")
131-
val hasInitialList = androidBridge.hasInitialDeviceList()
132-
logger.d("AdbWrapperImpl.isReady() - hasInitialDeviceList=$hasInitialList")
133-
134-
if (isConnected && hasInitialList) {
129+
if (isConnected) {
135130
logger.d("AdbWrapperImpl.isReady() - bridge is ready immediately")
136131
return true
137132
}
@@ -177,13 +172,12 @@ class AdbWrapperImpl(private val logger: AppLogger, project: Project) : AdbWrapp
177172
while (System.currentTimeMillis() < deadline) {
178173
attempts++
179174
val isConnected = androidBridge.isConnected
180-
val hasInitialList = androidBridge.hasInitialDeviceList()
181-
if (isConnected && hasInitialList) {
175+
if (isConnected) {
182176
result.set(true)
183177
logger.d("AdbWrapperImpl.waitForReady() - bridge ready after $attempts attempts")
184178
break
185179
}
186-
logger.d("AdbWrapperImpl.waitForReady() - attempt $attempts: isConnected=$isConnected, hasInitialDeviceList=$hasInitialList")
180+
logger.d("AdbWrapperImpl.waitForReady() - attempt $attempts: isConnected=$isConnected")
187181
Thread.sleep(pollIntervalMs)
188182
}
189183
if (!result.get()) {

0 commit comments

Comments
 (0)