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

Commit 7c9c5f29 authored by shaoweishen's avatar shaoweishen Committed by Shaowei Shen
Browse files

[Output Switcher] Fix list order for preference 

Add system route to the top even Preference been set.
add check for isScanning to prevent exception

Bug: 286593457
Bug: 260055330
Test: make -j64 RunSettingsLibRoboTests ROBOTEST_FILTER="com.android.settingslib.media.InfoMediaManagerTest"
Change-Id: Ic7245f9c4169eabf63aa8eabac9b6a57fbc4ea7b
Merged-In: Ic7245f9c4169eabf63aa8eabac9b6a57fbc4ea7b
parent f0d08645

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

+24 −17
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class InfoMediaManager extends MediaManager { 
    MediaRouter2Manager mRouterManager;

    @VisibleForTesting

    String mPackageName;

    boolean mIsScanning = false;



    private MediaDevice mCurrentConnectedDevice;

    private LocalBluetoothManager mBluetoothManager;
@@ -110,22 +111,29 @@ public class InfoMediaManager extends MediaManager { 


    @Override

    public void startScan() {

        if (!mIsScanning) {

            mMediaDevices.clear();

            mRouterManager.registerCallback(mExecutor, mMediaRouterCallback);

            mRouterManager.registerScanRequest();

            mIsScanning = true;

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE

                    && !TextUtils.isEmpty(mPackageName)) {

                RouteListingPreference routeListingPreference =

                        mRouterManager.getRouteListingPreference(mPackageName);

            Api34Impl.onRouteListingPreferenceUpdated(routeListingPreference, mPreferenceItemMap);

                Api34Impl.onRouteListingPreferenceUpdated(routeListingPreference,

                        mPreferenceItemMap);

            }

            refreshDevices();

        }

    }



    @Override

    public void stopScan() {

        if (mIsScanning) {

            mRouterManager.unregisterCallback(mMediaRouterCallback);

            mRouterManager.unregisterScanRequest();

            mIsScanning = false;

        }

    }



    /**
@@ -701,20 +709,19 @@ public class InfoMediaManager extends MediaManager { 
                List<MediaRoute2Info> selectedRouteInfos, List<MediaRoute2Info> infolist,

                List<RouteListingPreference.Item> preferenceRouteListing) {

            final List<MediaRoute2Info> sortedInfoList = new ArrayList<>(selectedRouteInfos);

            infolist.removeAll(selectedRouteInfos);

            sortedInfoList.addAll(infolist.stream().filter(

                    MediaRoute2Info::isSystemRoute).collect(Collectors.toList()));

            for (RouteListingPreference.Item item : preferenceRouteListing) {

                for (MediaRoute2Info info : infolist) {

                    if (item.getRouteId().equals(info.getId())

                            && !selectedRouteInfos.contains(info)) {

                            && !selectedRouteInfos.contains(info)

                            && !info.isSystemRoute()) {

                        sortedInfoList.add(info);

                        break;

                    }

                }

            }

            if (sortedInfoList.size() != infolist.size()) {

                infolist.removeAll(sortedInfoList);

                sortedInfoList.addAll(infolist.stream().filter(

                        MediaRoute2Info::isSystemRoute).collect(Collectors.toList()));

            }

            return sortedInfoList;

        }

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

+29 −6
Original line number Diff line number Diff line
@@ -113,6 +113,23 @@ public class InfoMediaManagerTest { 
        mInfoMediaManager.mRouterManager = MediaRouter2Manager.getInstance(mContext);

    }



    @Test

    public void stopScan_notStartFirst_notCallsUnregister() {

        mInfoMediaManager.mRouterManager = mRouterManager;

        mInfoMediaManager.stopScan();



        verify(mRouterManager, never()).unregisterScanRequest();

    }



    @Test

    public void stopScan_startFirst_callsUnregister() {

        mInfoMediaManager.mRouterManager = mRouterManager;

        mInfoMediaManager.startScan();

        mInfoMediaManager.stopScan();



        verify(mRouterManager).unregisterScanRequest();

    }



    @Test

    public void onRouteAdded_getAvailableRoutes_shouldAddMediaDevice() {

        final List<RoutingSessionInfo> routingSessionInfos = new ArrayList<>();
@@ -327,11 +344,12 @@ public class InfoMediaManagerTest { 
                routeListingPreference);

        mInfoMediaManager.mMediaRouterCallback.onRoutesUpdated();



        assertThat(mInfoMediaManager.mMediaDevices).hasSize(3);

        assertThat(mInfoMediaManager.mMediaDevices).hasSize(4);

        assertThat(mInfoMediaManager.mMediaDevices.get(0).getId()).isEqualTo(TEST_ID);

        assertThat(mInfoMediaManager.mMediaDevices.get(1).getId()).isEqualTo(TEST_ID_4);

        assertThat(mInfoMediaManager.mMediaDevices.get(1).isSuggestedDevice()).isTrue();

        assertThat(mInfoMediaManager.mMediaDevices.get(2).getId()).isEqualTo(TEST_ID_3);

        assertThat(mInfoMediaManager.mMediaDevices.get(1).getId()).isEqualTo(TEST_ID_1);

        assertThat(mInfoMediaManager.mMediaDevices.get(2).getId()).isEqualTo(TEST_ID_4);

        assertThat(mInfoMediaManager.mMediaDevices.get(2).isSuggestedDevice()).isTrue();

        assertThat(mInfoMediaManager.mMediaDevices.get(3).getId()).isEqualTo(TEST_ID_3);

    }



    @Test
@@ -405,8 +423,13 @@ public class InfoMediaManagerTest { 
        when(availableInfo3.getClientPackageName()).thenReturn(packageName);

        availableRoutes.add(availableInfo3);



        when(mRouterManager.getAvailableRoutes(packageName)).thenReturn(

                availableRoutes);

        final MediaRoute2Info availableInfo4 = mock(MediaRoute2Info.class);

        when(availableInfo4.getId()).thenReturn(TEST_ID_1);

        when(availableInfo4.isSystemRoute()).thenReturn(true);

        when(availableInfo4.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);

        availableRoutes.add(availableInfo4);



        when(mRouterManager.getAvailableRoutes(packageName)).thenReturn(availableRoutes);



        return availableRoutes;

    }