Merge "Fix connection state broadcasts" am: f0e92bd5a0 (5ae6ec2f) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -437,9 +437,12 @@ final class A2dpSinkStateMachine extends StateMachine {
		}
		} else {
		loge("Unknown device Connected: " + device);
		// something is wrong here, but sync our state with stack
		// something is wrong here, but sync our state with stack by connecting to
		// the new device and disconnect from previous device.
		broadcastConnectionState(device, BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_DISCONNECTED);
		broadcastConnectionState(mCurrentDevice, BluetoothProfile.STATE_DISCONNECTED,
		BluetoothProfile.STATE_CONNECTING);
		synchronized (A2dpSinkStateMachine.this) {
		mCurrentDevice = device;
		mTargetDevice = null;

+3 −3

Original line number	Diff line number	Diff line
		@@ -1092,8 +1092,8 @@ final class HeadsetClientStateMachine extends StateMachine {
		transitionTo(mDisconnected);
		broadcastConnectionState(
		mCurrentDevice,
		BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);
		BluetoothProfile.STATE_DISCONNECTED,
		BluetoothProfile.STATE_CONNECTING);
		break;

		default:
		@@ -1240,7 +1240,7 @@ final class HeadsetClientStateMachine extends StateMachine {
		if (!disconnectNative(getByteAddress(dev))) {
		// disconnecting failed
		broadcastConnectionState(dev, BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_DISCONNECTED);
		BluetoothProfile.STATE_DISCONNECTING);
		break;
		}
		break;