From fb9b3516b110200de5782c10a24821fd0fd200e6 Mon Sep 17 00:00:00 2001
From: Danny <dannyirwin31@yahoo.com>
Date: Mon, 2 Nov 2026 17:24:14 -0800
Subject: [PATCH] Allow Disconnect from Galaxy for Starport Projecting Car

---
 .../starpilot/system/starport/auto_connect.py |  3 ++
 .../starpilot/system/starport/supervisor.py   | 44 ++++++++++++++++++-
 .../starport/tests/test_auto_connect.py       |  7 +++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/openpilot/starpilot/system/starport/auto_connect.py b/openpilot/starpilot/system/starport/auto_connect.py
index ca6598896e..35bdc3ee30 100644
--- a/openpilot/starpilot/system/starport/auto_connect.py
+++ b/openpilot/starpilot/system/starport/auto_connect.py
@@ -36,6 +36,9 @@ class AutoConnectPolicy:
     if running:
       self.suppressed = True
 
+  def hold(self) -> None:
+    self.suppressed = True
+
   def start_refused(self, now: float) -> None:
     self._not_before = now + START_REFUSED_WAIT
 
diff --git a/openpilot/starpilot/system/starport/supervisor.py b/openpilot/starpilot/system/starport/supervisor.py
index 8db49b4e27..bad64b1df4 100644
--- a/openpilot/starpilot/system/starport/supervisor.py
+++ b/openpilot/starpilot/system/starport/supervisor.py
@@ -1064,6 +1064,8 @@ class Supervisor:
       return None
     if operation == 'forget' and self.config['receiver_address'].upper() == address.upper():
       return self._forget_selected_car(owner, address, session)
+    if operation == 'disconnect' and self.config['receiver_address'].upper() == address.upper():
+      return self._disconnect_selected_car(owner, address, session)
     # select_receiver takes the supervisor lock before releasing an owner lease.
     # Keep that same order through connection, save and admission pruning so an
     # old adapter's successful action cannot save its car under a new adapter.
@@ -1096,6 +1098,26 @@ class Supervisor:
         identity_store.save_config(self.config)
       return result
 
+  def _disconnect_selected_car(self, owner, address: str, session: tuple):
+    """Disconnect the chosen car and keep auto-connect from reconnecting it until the next drive or a manual Start."""
+    from openpilot.starpilot.bluetooth.owner import BluetoothRejected
+    lease = owner.phone_lease
+    if not owner.session_valid(session):
+      raise BluetoothRejected('Galaxy session expired', code='session_expired')
+    if lease is not None and not lease.released and lease.session is not None:
+      raise BluetoothRejected('Finish Android Auto pairing first', code='busy')
+    self.auto.hold()
+    self.stop()
+    if self._session_alive():
+      raise BluetoothRejected('Android Auto is still stopping', code='busy')
+    lease = owner.phone_lease
+    if lease is None or lease.released:
+      return None
+    device = lease.phone.device(address)
+    if device is not None and device['connected']:
+      lease.phone._call(device['path'], 'org.bluez.Device1', 'Disconnect', timeout=12.0)
+    return owner.snapshot(session=session)
+
   def _forget_selected_car(self, owner, address: str, session: tuple):
     """Forget the chosen car even while auto-connect is retrying it: stop the attempt, then delete the pairing."""
     from openpilot.starpilot.bluetooth.owner import BluetoothRejected
@@ -1108,10 +1130,28 @@ class Supervisor:
     self.stop()
     if self._session_alive():
       raise BluetoothRejected('Android Auto is still stopping', code='busy')
-    result = owner.request('forget', address=address)
-    self.forget_receiver(address)
+    try:
+      result = owner.request('forget', address=address)
+    except Exception as error:
+      self.log("forget_car_error", error=repr(error)[:300])
+      result = self._forgotten_snapshot(owner, address, session, error)
+    try:
+      self.forget_receiver(address)
+    except Exception as error:
+      self.log("forget_receiver_error", error=repr(error)[:300])
     return result
 
+  def _forgotten_snapshot(self, owner, address: str, session: tuple, error: Exception):
+    """The pairing may already be gone when a later step fails: report success then, else re-raise."""
+    from openpilot.starpilot.bluetooth.owner import BluetoothRejected
+    try:
+      owner._client()._device_path(address)
+    except BluetoothRejected:
+      return owner.snapshot(session=session)
+    except Exception:
+      pass
+    raise error
+
   def _hfp_connected(self, address: str) -> None:
     if address.upper() in (self.config["receiver_address"].upper(), self.config.get("companion_address", "").upper()):
       now = time.monotonic()
diff --git a/openpilot/starpilot/system/starport/tests/test_auto_connect.py b/openpilot/starpilot/system/starport/tests/test_auto_connect.py
index 1cdb884ff5..d86663f50c 100644
--- a/openpilot/starpilot/system/starport/tests/test_auto_connect.py
+++ b/openpilot/starpilot/system/starport/tests/test_auto_connect.py
@@ -51,6 +51,13 @@ def test_policy_leaves_sessions_that_never_saw_the_car():
     assert decide(policy, now, running=True) is None
 
 
+def test_policy_hold_blocks_start_while_idle_until_next_drive():
+  policy = AutoConnectPolicy()
+  policy.hold()
+  assert decide(policy, 0, car_link=True) is None
+  assert decide(policy, 1, onroad=True, car_link=True) == "start"
+
+
 def test_policy_manual_stop_holds_until_next_drive():
   policy = AutoConnectPolicy()
   assert decide(policy, 0, onroad=True) == "start"