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

Commit a847ba40 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix bug 2619062 Music is routed to Phone speaker, though it is 

connected to A2DP media profile

When the phone is docked and using the dock A2DP, and the user
connects another A2DP device, make the dock unavailable immediately
before connecting the new A2DP device.

Change-Id: I82d53836fb509ee4ea7cdb68f467dfb946c634f8
parent 7b88af67

media/java/android/media/AudioService.java

+17 −2
Original line number Diff line number Diff line
@@ -1751,10 +1751,17 @@ public class AudioService extends IAudioService.Stub { 


    }



    private void cancelA2dpDeviceTimeout(String address) {

    private void cancelA2dpDeviceTimeout() {

        mAudioHandler.removeMessages(MSG_BTA2DP_DOCK_TIMEOUT);

    }



    private boolean hasScheduledA2dpDockTimeout() {

        return mAudioHandler.hasMessages(MSG_BTA2DP_DOCK_TIMEOUT);

    }



    /* cache of the address of the last dock the device was connected to */

    private String mDockAddress;



    /**

     * Receiver for misc intent broadcasts the Phone app cares about.

     */
@@ -1805,7 +1812,15 @@ public class AudioService extends IAudioService.Stub { 
                              state == BluetoothA2dp.STATE_PLAYING)) {

                    if (btDevice.isBluetoothDock()) {

                        // this could be a reconnection after a transient disconnection

                        cancelA2dpDeviceTimeout(address);

                        cancelA2dpDeviceTimeout();

                        mDockAddress = address;

                    } else {

                        // this could be a connection of another A2DP device before the timeout of

                        // a dock: cancel the dock timeout, and make the dock unavailable now

                        if(hasScheduledA2dpDockTimeout()) {

                            cancelA2dpDeviceTimeout();

                            makeA2dpDeviceUnavailableNow(mDockAddress);

                        }

                    }

                    makeA2dpDeviceAvailable(address);

                }