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

Commit d31d7397 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly. 

Merge commit '663ec308' into eclair-plus-aosp

* commit '663ec308':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
parents f6de904a 663ec308

core/java/android/server/BluetoothA2dpService.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -459,10 +459,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { 
            checkSinkSuspendState(state);

            checkSinkSuspendState(state);

            mTargetA2dpState = -1;

            mTargetA2dpState = -1;





            if (state == BluetoothA2dp.STATE_CONNECTING) {

                mAudioManager.setParameters("A2dpSuspended=false");

            }



            if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&

            if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&

                    state == BluetoothA2dp.STATE_CONNECTING ||

                    state == BluetoothA2dp.STATE_CONNECTING ||

                    state == BluetoothA2dp.STATE_CONNECTED) {

                    state == BluetoothA2dp.STATE_CONNECTED) {

media/java/android/media/AudioService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1438,6 +1438,8 @@ public class AudioService extends IAudioService.Stub { 
                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                                                         AudioSystem.DEVICE_STATE_AVAILABLE,

                                                         AudioSystem.DEVICE_STATE_AVAILABLE,

                                                         address);

                                                         address);

                    // Reset A2DP suspend state each time a new sink is connected

                    AudioSystem.setParameters("A2dpSuspended=false");

                    mConnectedDevices.put( new Integer(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP),

                    mConnectedDevices.put( new Integer(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP),

                            address);

                            address);

                }

                }