Revert "fix(ble): connect G2 arms with autoConnect=true"

This reverts commit a9df3de59b.
This commit is contained in:
MasterControl committed 2026-11-16 18:25:54 +00:00
1 parent c1ca1acf3b
commit d08a218810
3 files changed
+18 -21

No files matched your search

@@ -231,16 +231,17 @@ class FaceclawBleManager(context: Context) {
fun connect(address: String?, timeoutMs: Int): Boolean = connect(address, timeoutMs, false) fun connect(address: String?, timeoutMs: Int): Boolean = connect(address, timeoutMs, false)
/** /**
* autoConnect=true is used for the ring and both glasses arms. The ring specifically * EXPERIMENTAL (2026-09-11): the ring specifically needs autoConnect=true.
* needs it (Even's own vendor app connects the ring with Android's autoConnect flag * Even's own vendor app connects the ring with Android's autoConnect flag
* set, confirmed via its own BLE debug log, "connect() - device: ..., * set (confirmed via its own BLE debug log, "connect() - device: ...,
* auto: true"). A live test showed a ring-only direct connection dying almost * auto: true"), while every other faceclaw connection (both glasses arms)
* exactly 5 seconds in, repeatedly, with nothing else competing for it, and the * uses autoConnect=false. Direct connect (false) is faster to establish
* glasses arms showed the same "less patiently supervised" direct-connect drop. * but Android supervises it less patiently; a live test showed the
* Direct connect (false) is faster to establish but Android supervises it less * ring-only direct connection dying almost exactly 5 seconds in,
* patiently. autoConnect=true can take much longer to actually complete (Android * repeatedly, with nothing else competing for it. autoConnect=true can
* manages it as a background reconnect, not an immediate attempt), so it needs its * take much longer to actually complete (Android manages it as a
* own longer timeout. Like [connect], waits on an attempt already pending. * background reconnect, not an immediate attempt), so this needs its own
* longer timeout. Like [connect], waits on an attempt already pending.
*/ */
fun connect(address: String?, timeoutMs: Int, autoConnect: Boolean): Boolean { fun connect(address: String?, timeoutMs: Int, autoConnect: Boolean): Boolean {
val key = requireAddress(address) val key = requireAddress(address)
@@ -2339,12 +2339,9 @@ class GlassesSessionCore(
try { try {
// Dial both arms at once, so the left arm's attempt is already pending (and // Dial both arms at once, so the left arm's attempt is already pending (and
// can land) while the right arm is being set up; they share one window. // can land) while the right arm is being set up; they share one window.
// autoConnect=true for both arms: a direct connection is supervised less
// patiently by Android's stack and was observed dropping the link shortly
// after it came up (the same failure that made the ring require autoConnect).
val deadlineMs = now() + ConnectionOptions.ARM_CONNECT_WINDOW_MS val deadlineMs = now() + ConnectionOptions.ARM_CONNECT_WINDOW_MS
link.beginConnect(rightAddress, true) link.beginConnect(rightAddress, false)
link.beginConnect(leftAddress, true) link.beginConnect(leftAddress, false)
connectArm(rightAddress, true, deadlineMs) connectArm(rightAddress, true, deadlineMs)
connectArm(leftAddress, true, deadlineMs) connectArm(leftAddress, true, deadlineMs)
if (!sleepDuringConnectSettling(800)) { if (!sleepDuringConnectSettling(800)) {
@@ -2453,7 +2450,7 @@ class GlassesSessionCore(
internal fun connectArm(address: String, enableRenderNotify: Boolean, deadlineMs: Long) { internal fun connectArm(address: String, enableRenderNotify: Boolean, deadlineMs: Long) {
val timeoutMs = maxOf(deadlineMs - now(), ConnectionOptions.CONNECT_TIMEOUT_MS.toLong()) val timeoutMs = maxOf(deadlineMs - now(), ConnectionOptions.CONNECT_TIMEOUT_MS.toLong())
if (!link.connect(address, timeoutMs.toInt(), true)) { if (!link.connect(address, timeoutMs.toInt())) {
throw ArmUnreachableException(if (address.equals(leftAddress, ignoreCase = true)) "left" else "right", address) throw ArmUnreachableException(if (address.equals(leftAddress, ignoreCase = true)) "left" else "right", address)
} }
// requestConnectionPriority has no callback in this Android compile target, so there is // requestConnectionPriority has no callback in this Android compile target, so there is
@@ -2541,9 +2538,9 @@ class GlassesSessionCore(
logLine("connecting direct ring $ringAddress") logLine("connecting direct ring $ringAddress")
// autoConnect=true (see SessionLink.connect's 3-arg overload) - // autoConnect=true (see SessionLink.connect's 3-arg overload) -
// matches what Even's own app does for this device specifically. // matches what Even's own app does for this device specifically.
// Direct connect (false) was measured dying ~5s into an // Direct connect (false, the default used for the glasses) was
// otherwise-idle ring connection, repeatedly, with nothing else // measured dying ~5s into an otherwise-idle ring connection,
// competing for it. // repeatedly, with nothing else competing for it.
if (!link.connect(ringAddress, ConnectionOptions.RING_CONNECT_TIMEOUT_MS, true)) { if (!link.connect(ringAddress, ConnectionOptions.RING_CONNECT_TIMEOUT_MS, true)) {
throw IllegalStateException("connect failed: $ringAddress") throw IllegalStateException("connect failed: $ringAddress")
} }
@@ -18,8 +18,7 @@ interface SessionLink {
/** /**
* [connect] with the platform's background-reconnect mode (Android's autoConnect) when * [connect] with the platform's background-reconnect mode (Android's autoConnect) when
* [autoConnect] is set. The R1 ring and the G2 glasses arms both need it; platforms * [autoConnect] is set. The R1 ring needs it; platforms without the distinction ignore it.
* without the distinction ignore it.
*/ */
fun connect(address: String, timeoutMs: Int, autoConnect: Boolean): Boolean = connect(address, timeoutMs) fun connect(address: String, timeoutMs: Int, autoConnect: Boolean): Boolean = connect(address, timeoutMs)