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

Commit 04332256 authored by Anubhav Gupta's avatar Anubhav Gupta Committed by Andre Eisenbach
Browse files

Update UI properly in Connection race Conditions. 

Broadcast connection state of incoming device in pending
state and update UI for disconnection of outgoing connection.
This change in conjunction with bluedroid change handles
race condition scenarios when incoming and outgoing A2dp
connections collides.

Bug: 22028876
Change-Id: Ibd80fc7010613887df74fb1903b16de73c77939a
parent 45a12c86

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+32 −6
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ final class A2dpStateMachine extends StateMachine { 
                }

                break;

            case CONNECTION_STATE_DISCONNECTING:

                logw("Ignore HF DISCONNECTING event, device: " + device);

                logw("Ignore A2dp DISCONNECTING event, device: " + device);

                break;

            default:

                loge("Incorrect state: " + state);
@@ -359,6 +359,14 @@ final class A2dpStateMachine extends StateMachine { 
                        // outgoing connection failed

                        broadcastConnectionState(mTargetDevice, BluetoothProfile.STATE_DISCONNECTED,

                                                 BluetoothProfile.STATE_CONNECTING);

                        // check if there is some incoming connection request

                        if (mIncomingDevice != null) {

                            logi("disconnect for outgoing in pending state");

                            synchronized (A2dpStateMachine.this) {

                                mTargetDevice = null;

                            }

                            break;

                        }

                        synchronized (A2dpStateMachine.this) {

                            mTargetDevice = null;

                            transitionTo(mDisconnected);
@@ -399,11 +407,19 @@ final class A2dpStateMachine extends StateMachine { 
                } else if (mIncomingDevice != null && mIncomingDevice.equals(device)) {

                    broadcastConnectionState(mIncomingDevice, BluetoothProfile.STATE_CONNECTED,

                                             BluetoothProfile.STATE_CONNECTING);

                    // check for a2dp connection allowed for this device in race condition

                    if (okToConnect(mIncomingDevice)) {

                        logi("Ready to connect incoming Connection from pending state");

                        synchronized (A2dpStateMachine.this) {

                            mCurrentDevice = mIncomingDevice;

                            mIncomingDevice = null;

                            transitionTo(mConnected);

                        }

                    } else {

                        // A2dp connection unchecked for this device

                        loge("Incoming A2DP rejected from pending state");

                        disconnectA2dpNative(getByteAddress(device));

                    }

                } else {

                    loge("Unknown device Connected: " + device);

                    // something is wrong here, but sync our state with stack
@@ -432,7 +448,10 @@ final class A2dpStateMachine extends StateMachine { 
                } else {

                    // We get an incoming connecting request while Pending

                    // TODO(BT) is stack handing this case? let's ignore it for now

                    log("Incoming connection while pending, ignore");

                    log("Incoming connection while pending, accept it");

                    broadcastConnectionState(device, BluetoothProfile.STATE_CONNECTING,

                                             BluetoothProfile.STATE_DISCONNECTED);

                    mIncomingDevice = device;

                }

                break;

            case CONNECTION_STATE_DISCONNECTING:
@@ -544,6 +563,13 @@ final class A2dpStateMachine extends StateMachine { 
                            mCurrentDevice = null;

                            transitionTo(mDisconnected);

                        }

                    } else if (mTargetDevice != null && mTargetDevice.equals(device)) {

                        broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED,

                                                 BluetoothProfile.STATE_CONNECTING);

                        synchronized (A2dpStateMachine.this) {

                            mTargetDevice = null;

                        }

                        logi("Disconnected from mTargetDevice in connected state device: " + device);

                    } else {

                        loge("Disconnected from unknown device: " + device);

                    }