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

Commit 4c87b43c authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "System MR2: Fix bug on onTransfer and on getting initial routes" into sc-dev am: 9505f1d4 

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

Change-Id: Iaf692fc2cc065c405163d32e4ae553df4d29804c
parents 6d60df75 9505f1d4

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 {

media/java/android/media/MediaRouter2Manager.java

+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.

     */