Merge "Filter routes according to visibility when a router registers" into udc-dev (d731927c) · Commits · e / os / android_frameworks_base

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

+21 −6

Original line number	Diff line number	Diff line
		@@ -1643,6 +1643,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
		@@ -2544,12 +2564,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(