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

Commit 4d863fb6 authored by Alex Leung's avatar Alex Leung Committed by android-build-merger
Browse files

Merge "Fix bug with broadcasting the wrong audio state" 

am: 5c1f7b10

Change-Id: I289bd26ff85994a2995020d96baddc1e08387117
parents d5dbd5e6 5c1f7b10

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -627,16 +627,16 @@ public class A2dpSinkStateMachine extends StateMachine { 
                    mStreaming.obtainMessage(A2dpSinkStreamHandler.SRC_STR_START).sendToTarget();

                    mStreaming.obtainMessage(A2dpSinkStreamHandler.SRC_STR_START).sendToTarget();

                    if (mPlayingDevice == null) {

                    if (mPlayingDevice == null) {

                        mPlayingDevice = device;

                        mPlayingDevice = device;

                        broadcastAudioState(device, BluetoothA2dpSink.STATE_NOT_PLAYING,

                        broadcastAudioState(device, BluetoothA2dpSink.STATE_PLAYING,

                                BluetoothA2dpSink.STATE_PLAYING);

                                BluetoothA2dpSink.STATE_NOT_PLAYING);

                    }

                    }

                    break;

                    break;

                case AUDIO_STATE_REMOTE_SUSPEND:

                case AUDIO_STATE_REMOTE_SUSPEND:

                case AUDIO_STATE_STOPPED:

                case AUDIO_STATE_STOPPED:

                    mStreaming.obtainMessage(A2dpSinkStreamHandler.SRC_STR_STOP).sendToTarget();

                    mStreaming.obtainMessage(A2dpSinkStreamHandler.SRC_STR_STOP).sendToTarget();

                    if (mPlayingDevice != null) {

                    if (mPlayingDevice != null) {

                        broadcastAudioState(device, BluetoothA2dpSink.STATE_PLAYING,

                        broadcastAudioState(device, BluetoothA2dpSink.STATE_NOT_PLAYING,

                                BluetoothA2dpSink.STATE_NOT_PLAYING);

                                BluetoothA2dpSink.STATE_PLAYING);

                        mPlayingDevice = null;

                        mPlayingDevice = null;

                    }

                    }

                    break;

                    break;