diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt index 5b0b69c8f0..8194cea3b3 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt @@ -129,8 +129,9 @@ class SteamControllerBle(private val context: Context, router: InputRouter? = nu } } } - g.disconnect() - g.close() + // Android can refuse these (BLUETOOTH_CONNECT revoked); an exception on this thread would end the app. + runCatching { g.disconnect() }.onFailure { Log.w(TAG, "disconnect failed", it) } + runCatching { g.close() }.onFailure { Log.w(TAG, "close failed", it) } Log.i(TAG, "disconnected: $why") listener?.invoke() } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt index 9d05efea50..f97ca1bf88 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt @@ -48,9 +48,16 @@ class SteamControllerBleTest { controller.start() } + /** Runs what stop() posted unless stop() already quit the looper, then quits it. */ + private fun drain(looper: android.os.Looper) { + runCatching { shadowOf(looper).idle() } + looper.quit() + } + @After fun close() { controller.stop() - handler.looper.quit() + // The stop posts a disconnect; run it now, while Robolectric's environment still exists. + drain(handler.looper) } @Test fun stopReleasesAndDetachesInputBeforeQueuedCallbacksCanPublish() { @@ -126,7 +133,7 @@ class SteamControllerBleTest { assertTrue(Writer.reports.last().all { it == 0.toByte() }) } finally { replacement.stop() - replacementHandler.looper.quit() + drain(replacementHandler.looper) } } @@ -142,7 +149,7 @@ class SteamControllerBleTest { assertEquals(reports, Writer.reports.size) } finally { unused.stop() - ReflectionHelpers.getField(unused, "handler").looper.quit() + drain(ReflectionHelpers.getField(unused, "handler").looper) } }