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

Commit b5f82f61 authored by Iván Budnik's avatar Iván Budnik
Browse files

Remove duplicate code for route updates 

This is a non-functional change.

Bug: 309451111
Test: Presubmit.
Change-Id: If6001b05a569103311899ea09406e0eb4c8b96f7
parent 813da462

media/java/android/media/MediaRouter2.java

+4 −22
Original line number Diff line number Diff line
@@ -759,13 +759,7 @@ public final class MediaRouter2 { 
            return;

        }



        synchronized (mLock) {

            mRoutes.clear();

            for (MediaRoute2Info route : currentRoutes) {

                mRoutes.put(route.getId(), route);

            }

            updateFilteredRoutesLocked();

        }

        updateRoutesOnHandler(currentRoutes);



        RoutingSessionInfo oldInfo = mSystemController.getRoutingSessionInfo();

        mSystemController.setRoutingSessionInfo(currentSystemSessionInfo);
@@ -824,10 +818,10 @@ public final class MediaRouter2 { 
        }

    }



    void updateRoutesOnHandler(List<MediaRoute2Info> routes) {

    void updateRoutesOnHandler(List<MediaRoute2Info> newRoutes) {

        synchronized (mLock) {

            mRoutes.clear();

            for (MediaRoute2Info route : routes) {

            for (MediaRoute2Info route : newRoutes) {

                mRoutes.put(route.getId(), route);

            }

            updateFilteredRoutesLocked();
@@ -2703,16 +2697,6 @@ public final class MediaRouter2 { 
            notifyRouteListingPreferenceUpdated(routeListingPreference);

        }



        private void onRoutesUpdatedOnHandler(@NonNull List<MediaRoute2Info> routes) {

            synchronized (mLock) {

                mRoutes.clear();

                for (MediaRoute2Info route : routes) {

                    mRoutes.put(route.getId(), route);

                }

                updateFilteredRoutesLocked();

            }

        }



        private void onRequestFailedOnHandler(int requestId, int reason) {

            MediaRouter2Manager.TransferRequest matchingRequest = null;

            for (MediaRouter2Manager.TransferRequest request : mTransferRequests) {
@@ -2786,9 +2770,7 @@ public final class MediaRouter2 { 
            public void notifyRoutesUpdated(List<MediaRoute2Info> routes) {

                mHandler.sendMessage(

                        obtainMessage(

                                ProxyMediaRouter2Impl::onRoutesUpdatedOnHandler,

                                ProxyMediaRouter2Impl.this,

                                routes));

                                MediaRouter2::updateRoutesOnHandler, MediaRouter2.this, routes));

            }



            @Override