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

Commit ea5fd2a5 authored by vnori's avatar vnori Committed by android-build-merger
Browse files

Merge "When a duplicate connect request is received, return success to caller.... 

Merge "When a duplicate connect request is received, return success to caller. Returning fail is causing the caller to tear down the connection in progress." am: 947ec9e2 am: 3ebed7ec
am: 47cdb758

Change-Id: Ia50058e9f8e9b715979f79d77260f0af9d6db1bc
parents 4b5b9aa6 47cdb758

android/app/src/com/android/bluetooth/mapclient/MapClientService.java

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class MapClientService extends ProfileService { 
        if (state == BluetoothProfile.STATE_CONNECTED

                || state == BluetoothProfile.STATE_CONNECTING) {

            Log.w(TAG, "Received connect request while already connecting/connected.");

            return false;

            return true;

        }



        // Statemachine exists but not in connecting or connected state! it should
@@ -527,7 +527,7 @@ public class MapClientService extends ProfileService { 
                Log.d(TAG, "broadcast has device: (" + device.getAddress() + ", "

                        + device.getName() + ")");

            }

            MceStateMachine stateMachine = MapClientService.this.mMapInstanceMap.get(device);

            MceStateMachine stateMachine = mMapInstanceMap.get(device);

            if (stateMachine == null) {

                Log.e(TAG, "No Statemachine found for the device from broadcast");

                return;