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

Commit 5c6d75fe authored by Iván Budnik's avatar Iván Budnik Committed by Android (Google) Code Review
Browse files

Merge "Promote RoutingController#getTransferableRoutes() to public API" into main

parents 22409f05 6dc2dafd

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24455,6 +24455,7 @@ package android.media { 
    method @NonNull public android.media.RoutingSessionInfo getRoutingSessionInfo();

    method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectableRoutes();

    method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectedRoutes();

    method @FlaggedApi("com.android.media.flags.enable_get_transferable_routes") @NonNull public java.util.List<android.media.MediaRoute2Info> getTransferableRoutes();

    method public int getVolume();

    method public int getVolumeHandling();

    method public int getVolumeMax();

media/java/android/media/MediaRouter2.java

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.media; 
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

import static com.android.media.flags.Flags.FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES;

import static com.android.media.flags.Flags.FLAG_ENABLE_CROSS_USER_ROUTING_IN_MEDIA_ROUTER2;

import static com.android.media.flags.Flags.FLAG_ENABLE_GET_TRANSFERABLE_ROUTES;

import static com.android.media.flags.Flags.FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2;

import static com.android.media.flags.Flags.FLAG_ENABLE_SCREEN_OFF_SCANNING;
@@ -1752,8 +1753,9 @@ public final class MediaRouter2 { 
        /**

         * Returns the unmodifiable list of transferable routes for the session.

         *

         * @hide

         * @see RoutingSessionInfo#getTransferableRoutes()

         */

        @FlaggedApi(FLAG_ENABLE_GET_TRANSFERABLE_ROUTES)

        @NonNull

        public List<MediaRoute2Info> getTransferableRoutes() {

            List<String> transferableRoutes;

media/java/android/media/flags/media_better_together.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ flag { 
    bug: "295518668"

}



flag {

    name: "enable_get_transferable_routes"

    namespace: "media_solutions"

    description: "Exposes RoutingController#getTransferableRoutes() (previously hidden) to the public API."

    bug: "323154573"

}



flag {

    name: "enable_prevention_of_keep_alive_route_providers"

    namespace: "media_solutions"