forked from Blendman974/faceclaw
Revert "fix(ble): connect G2 arms with autoConnect=true"
This reverts commit a9df3de59b.
This commit is contained in:
1 parent
c1ca1acf3b
commit
d08a218810
3 files changed
+18
-21
No files matched your search
+6
-9
@@ -2339,12 +2339,9 @@ class GlassesSessionCore(
|
||||
try {
|
||||
// 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.
|
||||
// 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
|
||||
link.beginConnect(rightAddress, true)
|
||||
link.beginConnect(leftAddress, true)
|
||||
link.beginConnect(rightAddress, false)
|
||||
link.beginConnect(leftAddress, false)
|
||||
connectArm(rightAddress, true, deadlineMs)
|
||||
connectArm(leftAddress, true, deadlineMs)
|
||||
if (!sleepDuringConnectSettling(800)) {
|
||||
@@ -2453,7 +2450,7 @@ class GlassesSessionCore(
|
||||
|
||||
internal fun connectArm(address: String, enableRenderNotify: Boolean, deadlineMs: Long) {
|
||||
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)
|
||||
}
|
||||
// requestConnectionPriority has no callback in this Android compile target, so there is
|
||||
@@ -2541,9 +2538,9 @@ class GlassesSessionCore(
|
||||
logLine("connecting direct ring $ringAddress")
|
||||
// autoConnect=true (see SessionLink.connect's 3-arg overload) -
|
||||
// matches what Even's own app does for this device specifically.
|
||||
// Direct connect (false) was measured dying ~5s into an
|
||||
// otherwise-idle ring connection, repeatedly, with nothing else
|
||||
// competing for it.
|
||||
// Direct connect (false, the default used for the glasses) was
|
||||
// measured dying ~5s into an otherwise-idle ring connection,
|
||||
// repeatedly, with nothing else competing for it.
|
||||
if (!link.connect(ringAddress, ConnectionOptions.RING_CONNECT_TIMEOUT_MS, true)) {
|
||||
throw IllegalStateException("connect failed: $ringAddress")
|
||||
}
|
||||
|
||||
+1
-2
@@ -18,8 +18,7 @@ interface SessionLink {
|
||||
|
||||
/**
|
||||
* [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
|
||||
* without the distinction ignore it.
|
||||
* [autoConnect] is set. The R1 ring needs it; platforms without the distinction ignore it.
|
||||
*/
|
||||
fun connect(address: String, timeoutMs: Int, autoConnect: Boolean): Boolean = connect(address, timeoutMs)
|
||||
|
||||
|
||||
Reference in new issue
Block a user