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

Commit 05805371 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "BluetoothServices: On unbond disconnected services if needed" into tm-qpr-dev

parents 4ab9a82e 05abc814

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

+2 −0
Original line number Diff line number Diff line
@@ -649,6 +649,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

+2 −0
Original line number Diff line number Diff line
@@ -907,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);