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

Commit 215883ea authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f34896 

am: b7aade04

Change-Id: I640a4e72df2bf3e43136d8dc70000ba0305a083b
parents 5c6c1c9c b7aade04

services/core/java/com/android/server/audio/AudioService.java

+13 −2
Original line number Diff line number Diff line
@@ -5450,10 +5450,21 @@ public class AudioService extends IAudioService.Stub 
        } else if (device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE ||

                   device == AudioSystem.DEVICE_OUT_LINE) {

            intent.setAction(Intent.ACTION_HEADSET_PLUG);

            intent.putExtra("microphone", (device & AudioSystem.DEVICE_BIT_IN) != 0 ? 1 : 0);

            intent.putExtra("microphone",  0);

        } else if (device == AudioSystem.DEVICE_OUT_USB_HEADSET) {

            intent.setAction(Intent.ACTION_HEADSET_PLUG);

            intent.putExtra("microphone", 0);

            intent.putExtra("microphone",

                    AudioSystem.getDeviceConnectionState(AudioSystem.DEVICE_IN_USB_HEADSET, "")

                        == AudioSystem.DEVICE_STATE_AVAILABLE ? 1 : 0);

        } else if (device == AudioSystem.DEVICE_IN_USB_HEADSET) {

            if (AudioSystem.getDeviceConnectionState(AudioSystem.DEVICE_OUT_USB_HEADSET, "")

                    == AudioSystem.DEVICE_STATE_AVAILABLE) {

                intent.setAction(Intent.ACTION_HEADSET_PLUG);

                intent.putExtra("microphone", 1);

            } else {

                // do not send ACTION_HEADSET_PLUG when only the input side is seen as changing

                return;

            }

        } else if (device == AudioSystem.DEVICE_OUT_HDMI ||

                device == AudioSystem.DEVICE_OUT_HDMI_ARC) {

            configureHdmiPlugIntent(intent, state);