diff options
| author | 2024-02-09 18:55:12 +0000 | |
|---|---|---|
| committer | 2024-02-09 18:55:12 +0000 | |
| commit | 5c6d75fe5c20f82e845c6cd067fda41633841ae7 (patch) | |
| tree | bab7dd30927959359f75e16dd4e8ba1e07dd5129 | |
| parent | 22409f056598c04235b92793545efa22f646bfb2 (diff) | |
| parent | 6dc2dafdd5109c2d101f286e2251b14476552286 (diff) | |
Merge "Promote RoutingController#getTransferableRoutes() to public API" into main
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaRouter2.java | 4 | ||||
| -rw-r--r-- | media/java/android/media/flags/media_better_together.aconfig | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 477f0a634142..3fde9a69c5fb 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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(); diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index 062c44275223..7fa3ed654ebc 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -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; diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig index 9e812f349d79..8dba04066ad9 100644 --- a/media/java/android/media/flags/media_better_together.aconfig +++ b/media/java/android/media/flags/media_better_together.aconfig @@ -85,6 +85,13 @@ flag { } 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" description: "Enables mechanisms to prevent route providers from keeping malicious apps alive." |