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

Commit 5ea10444 authored by Derek Jedral's avatar Derek Jedral Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong device being considered selected" into main

parents 726116c4 45ad2e5c

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

+1 −2
Original line number Diff line number Diff line
@@ -864,8 +864,7 @@ public abstract class InfoMediaManager { 
            }



            // Add selected routes first.

            if (com.android.media.flags.Flags.enableOutputSwitcherSessionGrouping()

                    && sortedRouteIds.size() != selectedRoutes.size()) {

            if (sortedRouteIds.size() != selectedRoutes.size()) {

                for (MediaRoute2Info selectedRoute : selectedRoutes) {

                    sortedRouteIds.add(selectedRoute.getId());

                }

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

+17 −0
Original line number Diff line number Diff line
@@ -1003,4 +1003,21 @@ public class InfoMediaManagerTest { 
        assertThat(routeOrder.get(2).getId()).isEqualTo(TEST_ID_4);

        assertThat(routeOrder.get(3).getId()).isEqualTo(TEST_ID_1);

    }



    @Test

    public void selectedRouteAppearsFirst() {

        RouteListingPreference routeListingPreference =

                setUpPreferenceList(TEST_PACKAGE_NAME, true);

        List<MediaRoute2Info> routes = setAvailableRoutesList(TEST_PACKAGE_NAME);

        List<MediaRoute2Info> selectedRoutes = List.of(routes.get(2));



        List<MediaRoute2Info> routeOrder =

                Api34Impl.arrangeRouteListByPreference(

                        selectedRoutes, routes, routeListingPreference);



        assertThat(routeOrder.stream().map(MediaRoute2Info::getId).toArray())

                .asList()

                .containsExactly(TEST_ID_4, TEST_ID_1, TEST_ID_3)

                .inOrder();

    }

}