diff --git a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java index 1e9632402da03..d7a77cd071167 100644 --- a/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java +++ b/services/companion/java/com/android/server/companion/presence/CompanionDevicePresenceMonitor.java @@ -164,6 +164,12 @@ public class CompanionDevicePresenceMonitor implements AssociationStore.OnChange @Override public void onBluetoothCompanionDeviceDisconnected(int associationId) { + // If disconnected device is also a BLE device, skip the 2-minute timer and mark it as gone. + boolean isConnectableBleDevice = mNearbyBleDevices.remove(associationId); + if (DEBUG && isConnectableBleDevice) { + Log.d(TAG, "Bluetooth device disconnect was detected." + + " Pre-emptively marking the BLE device as lost."); + } onDeviceGone(mConnectedBtDevices, associationId, /* sourceLoggingTag */ "bt"); }