Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f567039 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit '60823dc1':
  Add more intelligence to bluetooth connection state
parents 3ab3ffc6 60823dc1
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -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