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

Commit ae46a5f7 authored by Chung Tang's avatar Chung Tang
Browse files

[OutputSwitcher] Fix InfoMediaManager to return correct media devices list 

Bug: 385672684
Test: atest
Flag: com.android.media.flags.enable_output_switcher_personal_audio_sharing

Change-Id: If23d66000ea950b09c491e4a60b948f820d1817c
parent 2b5b206d

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

+42 −18
Original line number Diff line number Diff line
@@ -591,10 +591,14 @@ public abstract class InfoMediaManager { 


        final List<MediaDevice> deviceList = new ArrayList<>();

        for (MediaRoute2Info route : getSelectableRoutes(info)) {

            if (com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing()) {

                deviceList.add(createMediaDeviceFromRoute(route));

            } else {

                deviceList.add(

                        new InfoMediaDevice(

                                mContext, route, mPreferenceItemMap.get(route.getId())));

            }

        }

        return deviceList;

    }
@@ -608,8 +612,13 @@ public abstract class InfoMediaManager { 


        final List<MediaDevice> deviceList = new ArrayList<>();

        for (MediaRoute2Info route : getTransferableRoutes(info)) {

            if (com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing()) {

                deviceList.add(createMediaDeviceFromRoute(route));

            } else {

                deviceList.add(

                    new InfoMediaDevice(mContext, route, mPreferenceItemMap.get(route.getId())));

                        new InfoMediaDevice(

                                mContext, route, mPreferenceItemMap.get(route.getId())));

            }

        }

        return deviceList;

    }
@@ -624,9 +633,13 @@ public abstract class InfoMediaManager { 


        final List<MediaDevice> deviceList = new ArrayList<>();

        for (MediaRoute2Info route : getDeselectableRoutes(info)) {

            if (com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing()) {

                deviceList.add(createMediaDeviceFromRoute(route));

            } else {

                deviceList.add(

                        new InfoMediaDevice(

                                mContext, route, mPreferenceItemMap.get(route.getId())));

            }

            Log.d(TAG, route.getName() + " is deselectable for " + mPackageName);

        }

        return deviceList;
@@ -642,10 +655,14 @@ public abstract class InfoMediaManager { 


        final List<MediaDevice> deviceList = new ArrayList<>();

        for (MediaRoute2Info route : getSelectedRoutes(info)) {

            if (com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing()) {

                deviceList.add(createMediaDeviceFromRoute(route));

            } else {

                deviceList.add(

                        new InfoMediaDevice(

                                mContext, route, mPreferenceItemMap.get(route.getId())));

            }

        }

        return deviceList;

    }
@@ -892,6 +909,17 @@ public abstract class InfoMediaManager { 
    @SuppressWarnings("NewApi")

    @VisibleForTesting

    void addMediaDevice(@NonNull MediaRoute2Info route, @NonNull RoutingSessionInfo activeSession) {

        MediaDevice mediaDevice = createMediaDeviceFromRoute(route);

        if (mediaDevice != null) {

            if (activeSession.getSelectedRoutes().contains(route.getId())) {

                setDeviceState(mediaDevice, STATE_SELECTED);

            }

            mMediaDevices.add(mediaDevice);

        }

    }



    @Nullable

    private MediaDevice createMediaDeviceFromRoute(@NonNull MediaRoute2Info route) {

        final int deviceType = route.getType();

        MediaDevice mediaDevice = null;

        if (isInfoMediaDevice(deviceType)) {
@@ -925,14 +953,10 @@ public abstract class InfoMediaManager { 
                    new ComplexMediaDevice(mContext, route, mPreferenceItemMap.get(route.getId()));



        } else {

            Log.w(TAG, "addMediaDevice() unknown device type : " + deviceType);

        }

        if (mediaDevice != null) {

            if (activeSession.getSelectedRoutes().contains(route.getId())) {

                setDeviceState(mediaDevice, STATE_SELECTED);

            }

            mMediaDevices.add(mediaDevice);

            Log.w(TAG, "createRouteToMediaDevice() unknown device type : " + deviceType);

        }



        return mediaDevice;

    }



    /** Updates the state of the device and updates liteners of the updated device state. */