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

Commit 220d8441 authored by Jeremy Wu's avatar Jeremy Wu Committed by Android (Google) Code Review
Browse files

Merge changes I2ca57715,I6798fe92,I718e5f78 into main 

* changes:
  InputRouteManager: use address in creating input device
  UsbAlsaManager: support MULTI_DEV_MULTI_CONN_MODE
  UsbAlsaManager: wait for device address on usb added
parents 8bd434f1 e3772344

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

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public class InputMediaDevice extends MediaDevice { 


    private final String mId;



    private final String mAddress;



    private final @AudioDeviceType int mAudioDeviceInfoType;



    private final int mMaxVolume;
@@ -55,6 +57,7 @@ public class InputMediaDevice extends MediaDevice { 
    private InputMediaDevice(

            @NonNull Context context,

            @NonNull String id,

            @NonNull String address,

            @AudioDeviceType int audioDeviceInfoType,

            int maxVolume,

            int currentVolume,
@@ -62,6 +65,7 @@ public class InputMediaDevice extends MediaDevice { 
            @Nullable String productName) {

        super(context, /* info= */ null, /* item= */ null);

        mId = id;

        mAddress = address;

        mAudioDeviceInfoType = audioDeviceInfoType;

        mMaxVolume = maxVolume;

        mCurrentVolume = currentVolume;
@@ -74,6 +78,7 @@ public class InputMediaDevice extends MediaDevice { 
    public static InputMediaDevice create(

            @NonNull Context context,

            @NonNull String id,

            @NonNull String address,

            @AudioDeviceType int audioDeviceInfoType,

            int maxVolume,

            int currentVolume,
@@ -86,6 +91,7 @@ public class InputMediaDevice extends MediaDevice { 
        return new InputMediaDevice(

                context,

                id,

                address,

                audioDeviceInfoType,

                maxVolume,

                currentVolume,
@@ -97,6 +103,10 @@ public class InputMediaDevice extends MediaDevice { 
        return mAudioDeviceInfoType;

    }



    public @NonNull String getAddress() {

        return mAddress;

    }



    public static boolean isSupportedInputDevice(@AudioDeviceType int audioDeviceInfoType) {

        return switch (audioDeviceInfoType) {

            case TYPE_BUILTIN_MIC,

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

+62 −21
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.media.AudioManager; 
import android.media.MediaRecorder;

import android.os.Handler;

import android.os.HandlerExecutor;

import android.text.TextUtils;

import android.util.Slog;



import androidx.annotation.NonNull;
@@ -67,6 +68,7 @@ public final class InputRouteManager { 
    @VisibleForTesting final List<MediaDevice> mInputMediaDevices = new CopyOnWriteArrayList<>();



    private @AudioDeviceType int mSelectedInputDeviceType;

    private String mSelectedInputDeviceAddr;



    private final Collection<InputDeviceCallback> mCallbacks = new CopyOnWriteArrayList<>();

    private final Object mCallbackLock = new Object();
@@ -81,24 +83,30 @@ public final class InputRouteManager { 
                    // Activate the last hot plugged valid input device, to match the output device

                    // behavior.

                    @AudioDeviceType int deviceTypeToActivate = mSelectedInputDeviceType;

                    String deviceAddrToActivate = mSelectedInputDeviceAddr;

                    for (AudioDeviceInfo info : addedDevices) {

                        @AudioDeviceType int type = info.getType();

                        String addr = info.getAddress();

                        // Since onAudioDevicesAdded is called not only when new device is hot

                        // plugged, but also when the switcher dialog is opened, make sure to check

                        // against existing device list and only activate if the device does not

                        // exist previously.

                        if (InputMediaDevice.isSupportedInputDevice(type)

                                && findDeviceByType(type) == null) {

                                && findDeviceByTypeAndAddress(type, addr) == null) {

                            deviceTypeToActivate = type;

                            deviceAddrToActivate = addr;

                        }

                    }



                    // 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) {

                    if (mSelectedInputDeviceType != deviceTypeToActivate

                            || mSelectedInputDeviceAddr != deviceAddrToActivate) {

                        mSelectedInputDeviceType = deviceTypeToActivate;

                        mSelectedInputDeviceAddr = deviceAddrToActivate;

                        AudioDeviceAttributes deviceAttributes =

                                createInputDeviceAttributes(mSelectedInputDeviceType);

                                createInputDeviceAttributes(

                                        mSelectedInputDeviceType, mSelectedInputDeviceAddr);

                        setPreferredDeviceForAllPresets(deviceAttributes);

                    }

                }
@@ -151,8 +159,18 @@ public final class InputRouteManager { 
        }

    }



    // TODO(b/355684672): handle edge case where there are two devices with the same type. Only

    // using a single type might not be enough to recognize the correct device.

    @Nullable

    private MediaDevice findDeviceByTypeAndAddress(@AudioDeviceType int type, String addr) {

        for (MediaDevice device : mInputMediaDevices) {

            if (((InputMediaDevice) device).getAudioDeviceInfoType() == type

                    && (TextUtils.isEmpty(addr)

                            || ((InputMediaDevice) device).getAddress().equals(addr))) {

                return device;

            }

        }

        return null;

    }



    @Nullable

    private MediaDevice findDeviceByType(@AudioDeviceType int type) {

        for (MediaDevice device : mInputMediaDevices) {
@@ -165,28 +183,44 @@ public final class InputRouteManager { 


    @Nullable

    public MediaDevice getSelectedInputDevice() {

        return findDeviceByType(mSelectedInputDeviceType);

        MediaDevice exactDevice =

                findDeviceByTypeAndAddress(mSelectedInputDeviceType, mSelectedInputDeviceAddr);



        // This can happen because the address can sometimes contain surprising strings

        // such as "bottom" for the default internal mic. In those situations,

        // ignore the address and search by the type only. In any case, this also

        // serves as a sane fallback.

        if (exactDevice == null) {

            MediaDevice device = findDeviceByType(mSelectedInputDeviceType);

            return device;

        }



        return exactDevice;

    }



    private void applyDefaultSelectedTypeToAllPresets() {

        mSelectedInputDeviceType = retrieveDefaultSelectedDeviceType();

        AudioDeviceAttributes deviceAttributes =

                createInputDeviceAttributes(mSelectedInputDeviceType);

        AudioDeviceAttributes deviceAttributes = retrieveDefaultSelectedInputDeviceAttrs();



        mSelectedInputDeviceType = deviceAttributes.getType();

        mSelectedInputDeviceAddr = deviceAttributes.getAddress();



        setPreferredDeviceForAllPresets(deviceAttributes);

    }



    private AudioDeviceAttributes createInputDeviceAttributes(@AudioDeviceType int type) {

        // Address is not used.

        return new AudioDeviceAttributes(AudioDeviceAttributes.ROLE_INPUT, type, /* address= */ "");

    private AudioDeviceAttributes createInputDeviceAttributes(@AudioDeviceType int type,

            String address) {

        return new AudioDeviceAttributes(AudioDeviceAttributes.ROLE_INPUT, type, address);

    }



    private @AudioDeviceType int retrieveDefaultSelectedDeviceType() {

    private AudioDeviceAttributes retrieveDefaultSelectedInputDeviceAttrs() {

        List<AudioDeviceAttributes> attributesOfSelectedInputDevices =

                mAudioManager.getDevicesForAttributes(INPUT_ATTRIBUTES);

        int selectedInputDeviceAttributesType;

        @AudioDeviceType int selectedType;

        String selectedAddr;

        if (attributesOfSelectedInputDevices.isEmpty()) {

            Slog.e(TAG, "Unexpected empty list of input devices. Using built-in mic.");

            selectedInputDeviceAttributesType = AudioDeviceInfo.TYPE_BUILTIN_MIC;

            selectedType = AudioDeviceInfo.TYPE_BUILTIN_MIC;

            selectedAddr = "";

        } else {

            if (attributesOfSelectedInputDevices.size() > 1) {

                Slog.w(
@@ -194,9 +228,10 @@ public final class InputRouteManager { 
                        "AudioManager.getDevicesForAttributes returned more than one element."

                                + " Using the first one.");

            }

            selectedInputDeviceAttributesType = attributesOfSelectedInputDevices.get(0).getType();

            selectedType = attributesOfSelectedInputDevices.get(0).getType();

            selectedAddr = attributesOfSelectedInputDevices.get(0).getAddress();

        }

        return selectedInputDeviceAttributesType;

        return createInputDeviceAttributes(selectedType, selectedAddr);

    }



    private void dispatchInputDeviceListUpdate() {
@@ -209,13 +244,16 @@ public final class InputRouteManager { 
                    InputMediaDevice.create(

                            mContext,

                            String.valueOf(info.getId()),

                            info.getAddress(),

                            info.getType(),

                            getMaxInputGain(),

                            getCurrentInputGain(),

                            isInputGainFixed(),

                            getProductNameFromAudioDeviceInfo(info));

            if (mediaDevice != null) {

                if (info.getType() == mSelectedInputDeviceType) {

                if (info.getType() == mSelectedInputDeviceType

                        && (TextUtils.isEmpty(mSelectedInputDeviceAddr)

                                || info.getAddress() == mSelectedInputDeviceAddr)) {

                    mInfoMediaManager.setDeviceState(mediaDevice, STATE_SELECTED);

                }

                mInputMediaDevices.add(mediaDevice);
@@ -255,7 +293,9 @@ public final class InputRouteManager { 
            return;

        }



        if (inputMediaDevice.getAudioDeviceInfoType() == mSelectedInputDeviceType) {

        if (inputMediaDevice.getAudioDeviceInfoType() == mSelectedInputDeviceType

                && (TextUtils.isEmpty(mSelectedInputDeviceAddr)

                        || inputMediaDevice.getAddress().equals(mSelectedInputDeviceAddr))) {

            Slog.w(TAG, "This device is already selected: " + device.getName());

            return;

        }
@@ -266,11 +306,12 @@ public final class InputRouteManager { 
            return;

        }



        // Update mSelectedInputDeviceType directly based on user action.

        // Update mSelectedInputDeviceType/Addr directly based on user action.

        mSelectedInputDeviceType = inputMediaDevice.getAudioDeviceInfoType();

        mSelectedInputDeviceAddr = inputMediaDevice.getAddress();



        AudioDeviceAttributes deviceAttributes =

                createInputDeviceAttributes(inputMediaDevice.getAudioDeviceInfoType());

                createInputDeviceAttributes(mSelectedInputDeviceType, mSelectedInputDeviceAddr);

        try {

            setPreferredDeviceForAllPresets(deviceAttributes);

        } catch (IllegalArgumentException e) {

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

+14 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ public class InputMediaDeviceTest { 
    private static final String PRODUCT_NAME_USB_HEADSET = "My USB Headset";

    private static final String PRODUCT_NAME_BT_HEADSET = "My Bluetooth Headset";

    private static final String PRODUCT_NAME_BLE_HEADSET = "My BLE Headset";

    private static final String ADDR_BUILTIN_MIC = "";

    private static final String ADDR_WIRED_HEADSET = "";

    private static final String ADDR_USB_HEADSET = "card=1;device=0";

    private static final String ADDR_BT_HEADSET = "00:11:22:33:44:55";

    private static final String ADDR_BLE_HEADSET = "11:11:22:33:44:55";



    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -63,6 +68,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BUILTIN_MIC_ID),

                        ADDR_BUILTIN_MIC,

                        AudioDeviceInfo.TYPE_BUILTIN_MIC,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -78,6 +84,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BUILTIN_MIC_ID),

                        ADDR_BUILTIN_MIC,

                        AudioDeviceInfo.TYPE_BUILTIN_MIC,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -94,6 +101,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(WIRED_HEADSET_ID),

                        ADDR_WIRED_HEADSET,

                        AudioDeviceInfo.TYPE_WIRED_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -110,6 +118,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(USB_HEADSET_ID),

                        ADDR_USB_HEADSET,

                        AudioDeviceInfo.TYPE_USB_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -125,6 +134,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(USB_HEADSET_ID),

                        ADDR_USB_HEADSET,

                        AudioDeviceInfo.TYPE_USB_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -141,6 +151,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BT_HEADSET_ID),

                        ADDR_BT_HEADSET,

                        AudioDeviceInfo.TYPE_BLUETOOTH_SCO,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -156,6 +167,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BT_HEADSET_ID),

                        ADDR_BT_HEADSET,

                        AudioDeviceInfo.TYPE_BLUETOOTH_SCO,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -172,6 +184,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BLE_HEADSET_ID),

                        ADDR_BLE_HEADSET,

                        AudioDeviceInfo.TYPE_BLE_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -187,6 +200,7 @@ public class InputMediaDeviceTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BLE_HEADSET_ID),

                        ADDR_BLE_HEADSET,

                        AudioDeviceInfo.TYPE_BLE_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,

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

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ public class InputRouteManagerTest { 
                InputMediaDevice.create(

                        mContext,

                        String.valueOf(BUILTIN_MIC_ID),

                        "",

                        AudioDeviceInfo.TYPE_BUILTIN_MIC,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -428,6 +429,7 @@ public class InputRouteManagerTest { 
        return InputMediaDevice.create(

                mContext,

                String.valueOf(info.getId()),

                info.getAddress(),

                info.getType(),

                MAX_VOLUME,

                CURRENT_VOLUME,

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { 
                InputMediaDevice.create(

                        mContext,

                        TEST_DEVICE_3_ID,

                        "",

                        AudioDeviceInfo.TYPE_BUILTIN_MIC,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -676,6 +677,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { 
                InputMediaDevice.create(

                        mContext,

                        TEST_DEVICE_4_ID,

                        "",

                        AudioDeviceInfo.TYPE_WIRED_HEADSET,

                        MAX_VOLUME,

                        CURRENT_VOLUME,
@@ -1456,6 +1458,7 @@ public class MediaSwitchingControllerTest extends SysuiTestCase { 
                InputMediaDevice.create(

                        mContext,

                        TEST_DEVICE_1_ID,

                        "",

                        AudioDeviceInfo.TYPE_BUILTIN_MIC,

                        MAX_VOLUME,

                        CURRENT_VOLUME,