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

Commit b62b2fc6 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Filter routes according to visibility when a router registers" into... 

Merge "Filter routes according to visibility when a router registers" into udc-dev am: d731927c am: af2e708a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23433496



Change-Id: Icf024b9b009344d4bd7ca9226e7330c2ec349edd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc30c69f af2e708a

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+21 −6
Original line number Diff line number Diff line
@@ -1642,6 +1642,26 @@ class MediaRouter2ServiceImpl { 
            mDiscoveryPreference.dump(pw, indent);

        }



        /**

         * Notifies the corresponding router that it was successfully registered.

         *

         * <p>The message sent to the router includes a snapshot of the initial state, including

         * known routes and the system {@link RoutingSessionInfo}.

         *

         * @param currentRoutes All currently known routes, which are filtered according to package

         *     visibility before being sent to the router.

         * @param currentSystemSessionInfo The current system {@link RoutingSessionInfo}.

         */

        public void notifyRegistered(

                List<MediaRoute2Info> currentRoutes, RoutingSessionInfo currentSystemSessionInfo) {

            try {

                mRouter.notifyRouterRegistered(

                        getVisibleRoutes(currentRoutes), currentSystemSessionInfo);

            } catch (RemoteException ex) {

                Slog.w(TAG, "Failed to notify router registered. Router probably died.", ex);

            }

        }



        /**

         * Sends the corresponding router an {@link

         * android.media.MediaRouter2.RouteCallback#onRoutesUpdated update} for the given {@code
@@ -2543,12 +2563,7 @@ class MediaRouter2ServiceImpl { 
                return;

            }



            try {

                routerRecord.mRouter.notifyRouterRegistered(

                        currentRoutes, currentSystemSessionInfo);

            } catch (RemoteException ex) {

                Slog.w(TAG, "Failed to notify router registered. Router probably died.", ex);

            }

            routerRecord.notifyRegistered(currentRoutes, currentSystemSessionInfo);

        }



        private static void notifyRoutesUpdatedToRouterRecords(