am 660130b9: Merge "Try to keep connection state more up to date" into mnc-dev

* commit '660130b9b01deaa36a714c7c137688ce456b4e55':
  Try to keep connection state more up to date
This commit is contained in:
Jason Monk
2015-06-19 15:03:10 +00:00
committed by Android Git Automerger

View File

@@ -154,6 +154,12 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
}
private void updateConnected() {
// Make sure our connection state is up to date.
int state = mLocalBluetoothManager.getBluetoothAdapter().getConnectionState();
if (state != mConnectionState) {
mConnectionState = state;
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
}
if (mLastDevice != null && mLastDevice.isConnected()) {
// Our current device is still valid.
return;
@@ -203,9 +209,9 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
@Override
public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
mConnectionState = state;
mLastDevice = cachedDevice;
updateConnected();
mConnectionState = state;
mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);
}