Merge "Add more intelligence to bluetooth connection state" into mnc-dev

This commit is contained in:
Jason Monk
2015-08-13 14:38:46 +00:00
committed by Android (Google) Code Review

View File

@@ -164,11 +164,18 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
// Our current device is still valid. // Our current device is still valid.
return; return;
} }
mLastDevice = null;
for (CachedBluetoothDevice device : getDevices()) { for (CachedBluetoothDevice device : getDevices()) {
if (device.isConnected()) { if (device.isConnected()) {
mLastDevice = device; mLastDevice = device;
} }
} }
if (mLastDevice == null && mConnectionState == BluetoothAdapter.STATE_CONNECTED) {
// If somehow we think we are connected, but have no connected devices, we aren't
// connected.
mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
}
} }
@Override @Override