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

Commit a1350e1f authored by Ugo Yu's avatar Ugo Yu Committed by android-build-merger
Browse files

Merge "SCO: Don't set active device if a diconnect message is defered" am:... 

Merge "SCO: Don't set active device if a diconnect message is defered" am: eed8d08a am: a5edbc25
am: c9a9ab1b

Change-Id: I5ffa9da8180d18b3ac00188742419dad499be721
parents da3db52a c9a9ab1b

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,8 @@ public class HeadsetStateMachine extends StateMachine { 
            // Set active device to current active SCO device when the current active device

            // is different from mCurrentDevice. This is to accommodate active device state

            // mis-match between native and Java.

            if (!mDevice.equals(mHeadsetService.getActiveDevice())) {

            if (!mDevice.equals(mHeadsetService.getActiveDevice())

                    && !hasDeferredMessages(DISCONNECT_AUDIO)) {

                mHeadsetService.setActiveDevice(mDevice);

            }

            setAudioParameters();