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

Commit 45ad2e5c authored by Derek Jedral's avatar Derek Jedral
Browse files

Fix wrong device being considered selected 

ag/31194237 has an incorrect condition check where we add selected
routes. The check is supposed to be gated behind the flag, but instead
the entire logic on added sorted routes was gated instead.

Bug: 394165966
Test: atest, local test
Flag: com.android.media.flags.enable_output_switcher_session_grouping
Change-Id: I285c6cf3cc6864e199f0067116e14d10c1464f94
parent 51290d7d

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();

    }

}