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

Commit d158b9b8 authored by Wenyu Zhang's avatar Wenyu Zhang
Browse files

Revert "Activate hot plugged device" 

This reverts commit a07f97b7.

Reason for revert: Somehow the newly plugged device does not appear in the device list from calling mAudioManager.getDevices(). Maybe there is some timing issue this function is called before the new device is fully available.

Bug: b/374174565
Change-Id: Ibb711be5755200bded34b65645966b869a34b876
parent a07f97b7

packages/SettingsLib/src/com/android/settingslib/media/InputRouteManager.java

+1 −17
Original line number Diff line number Diff line
@@ -74,23 +74,7 @@ public final class InputRouteManager { 
            new AudioDeviceCallback() {

                @Override

                public void onAudioDevicesAdded(@NonNull AudioDeviceInfo[] addedDevices) {

                    // Activate the last hot plugged valid input device, to match the output device

                    // behavior.

                    @AudioDeviceType int deviceTypeToActivate = mSelectedInputDeviceType;

                    for (AudioDeviceInfo info : addedDevices) {

                        if (InputMediaDevice.isSupportedInputDevice(info.getType())) {

                            deviceTypeToActivate = info.getType();

                        }

                    }



                    // Only activate if we find a different valid input device. e.g. if none of the

                    // addedDevices is supported input device, we don't need to activate anything.

                    if (mSelectedInputDeviceType != deviceTypeToActivate) {

                        mSelectedInputDeviceType = deviceTypeToActivate;

                        AudioDeviceAttributes deviceAttributes =

                                createInputDeviceAttributes(mSelectedInputDeviceType);

                        setPreferredDeviceForAllPresets(deviceAttributes);

                    }

                    applyDefaultSelectedTypeToAllPresets();

                }



                @Override

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InputRouteManagerTest.java

+9 −48
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -139,18 +138,6 @@ public class InputRouteManagerTest { 
                /* address= */ "");

    }



    private AudioDeviceAttributes getUsbHeadsetDeviceAttributes() {

        return new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_INPUT,

                AudioDeviceInfo.TYPE_USB_HEADSET,

                /* address= */ "");

    }



    private AudioDeviceAttributes getHdmiDeviceAttributes() {

        return new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_INPUT, AudioDeviceInfo.TYPE_HDMI, /* address= */ "");

    }



    private void onPreferredDevicesForCapturePresetChanged(InputRouteManager inputRouteManager) {

        final List<AudioDeviceAttributes> audioDeviceAttributesList =

                new ArrayList<AudioDeviceAttributes>();
@@ -316,47 +303,21 @@ public class InputRouteManagerTest { 
    }



    @Test

    public void onAudioDevicesAdded_shouldActivateAddedDevice() {

        final AudioManager audioManager = mock(AudioManager.class);

        InputRouteManager inputRouteManager = new InputRouteManager(mContext, audioManager);

        AudioDeviceInfo[] devices = {mockWiredHeadsetInfo()};

        inputRouteManager.mAudioDeviceCallback.onAudioDevicesAdded(devices);



        // The only added wired headset will be activated.

        for (@MediaRecorder.Source int preset : PRESETS) {

            verify(audioManager, atLeast(1))

                    .setPreferredDeviceForCapturePreset(preset, getWiredHeadsetDeviceAttributes());

        }

    }



    @Test

    public void onAudioDevicesAdded_shouldActivateLastAddedDevice() {

    public void onAudioDevicesAdded_shouldApplyDefaultSelectedDeviceToAllPresets() {

        final AudioManager audioManager = mock(AudioManager.class);

        InputRouteManager inputRouteManager = new InputRouteManager(mContext, audioManager);

        AudioDeviceInfo[] devices = {mockWiredHeadsetInfo(), mockUsbHeadsetInfo()};

        inputRouteManager.mAudioDeviceCallback.onAudioDevicesAdded(devices);



        // When adding multiple valid input devices, the last added device (usb headset in this

        // case) will be activated.

        for (@MediaRecorder.Source int preset : PRESETS) {

            verify(audioManager, never())

                    .setPreferredDeviceForCapturePreset(preset, getWiredHeadsetDeviceAttributes());

            verify(audioManager, atLeast(1))

                    .setPreferredDeviceForCapturePreset(preset, getUsbHeadsetDeviceAttributes());

        }

    }

        AudioDeviceAttributes wiredHeadsetDeviceAttributes = getWiredHeadsetDeviceAttributes();

        when(audioManager.getDevicesForAttributes(INPUT_ATTRIBUTES))

                .thenReturn(Collections.singletonList(wiredHeadsetDeviceAttributes));



    @Test

    public void onAudioDevicesAdded_doNotActivateInvalidAddedDevice() {

        final AudioManager audioManager = mock(AudioManager.class);

        InputRouteManager inputRouteManager = new InputRouteManager(mContext, audioManager);

        AudioDeviceInfo[] devices = {mockHdmiInfo()};

        AudioDeviceInfo[] devices = {mockWiredHeadsetInfo()};

        inputRouteManager.mAudioDeviceCallback.onAudioDevicesAdded(devices);



        // Do not activate since HDMI is not a valid input device.

        // Called twice, one after initiation, the other after onAudioDevicesAdded call.

        verify(audioManager, atLeast(2)).getDevicesForAttributes(INPUT_ATTRIBUTES);

        for (@MediaRecorder.Source int preset : PRESETS) {

            verify(audioManager, never())

                    .setPreferredDeviceForCapturePreset(preset, getHdmiDeviceAttributes());

            verify(audioManager, atLeast(2))

                    .setPreferredDeviceForCapturePreset(preset, wiredHeadsetDeviceAttributes);

        }

    }