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

Commit 55902e2d authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I70e7f0a8,I16a83e5b 

* changes:
  CsisService: Add missing return
  BluetoothServices: On unbond disconnected services if needed
parents 973cdd13 88ef4d2e

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+2 −0
Original line number Diff line number Diff line
@@ -636,6 +636,8 @@ public class BassClientService extends ProfileService { 
                return;

            }

            if (sm.getConnectionState() != BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnecting device because it was unbonded.");

                disconnect(device);

                return;

            }

            removeStateMachine(device);

android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
            CsipSetCoordinatorStateMachine smConnect = getOrCreateStateMachine(device);

            if (smConnect == null) {

                Log.e(TAG, "Cannot connect to " + device + " : no state machine");

                return false;

            }

            smConnect.sendMessage(CsipSetCoordinatorStateMachine.CONNECT);

        }
@@ -906,6 +907,8 @@ public class CsipSetCoordinatorService extends ProfileService { 
                return;

            }

            if (sm.getConnectionState() != BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnecting device because it was unbonded.");

                disconnect(device);

                return;

            }

            removeStateMachine(device);

android/app/src/com/android/bluetooth/hap/HapClientService.java

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ public class HapClientService extends ProfileService { 
                return;

            }

            if (sm.getConnectionState() != BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnecting device because it was unbonded.");

                disconnect(device);

                return;

            }

            removeStateMachine(device);

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+2 −0
Original line number Diff line number Diff line
@@ -777,6 +777,8 @@ public class HearingAidService extends ProfileService { 
                return;

            }

            if (sm.getConnectionState() != BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnecting device because it was unbonded.");

                disconnect(device);

                return;

            }

            removeStateMachine(device);

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+2 −0
Original line number Diff line number Diff line
@@ -984,6 +984,8 @@ public class VolumeControlService extends ProfileService { 
                return;

            }

            if (sm.getConnectionState() != BluetoothProfile.STATE_DISCONNECTED) {

                Log.i(TAG, "Disconnecting device because it was unbonded.");

                disconnect(device);

                return;

            }

            removeStateMachine(device);