Merge "System MR2: Fix bug on onTransfer and on getting initial routes" into sc-dev (9505f1d4) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRouter2.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -260,6 +260,9 @@ public final class MediaRouter2 {
		mManagerCallback = new ManagerCallback();
		mHandler = new Handler(Looper.getMainLooper());
		mSystemController = new SystemRoutingController(sManager.getSystemRoutingSession());
		mDiscoveryPreference = new RouteDiscoveryPreference.Builder(
		sManager.getPreferredFeatures(clientPackageName), true).build();
		updateAllRoutesFromManager();
		mMediaRouterService = null; // TODO: Make this non-null and check permission.

		// Only used by non-system MediaRouter2.
		@@ -1946,7 +1949,7 @@ public final class MediaRouter2 {
		}

		RoutingController newController;
		if (oldSession.isSystemSession()) {
		if (newSession.isSystemSession()) {
		mSystemController.setRoutingSessionInfo(newSession);
		newController = mSystemController;
		} else {

+14 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,20 @@ public final class MediaRouter2Manager {
		return routes;
		}

		/**
		* Returns the preferred features of the specified package name.
		*/
		@NonNull
		public List<String> getPreferredFeatures(@NonNull String packageName) {
		Objects.requireNonNull(packageName, "packageName must not be null");

		List<String> preferredFeatures = mPreferredFeaturesMap.get(packageName);
		if (preferredFeatures == null) {
		preferredFeatures = Collections.emptyList();
		}
		return preferredFeatures;
		}

		/**
		* Returns a list of routes which are related to the given package name in the given route list.
		*/