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

Commit f16acf8d authored by Shenqiu Zhang's avatar Shenqiu Zhang
Browse files

Clean up the flag enable_rlp_callbacks_in_media_router2 

The flag has been fully launched in Android V. We need to clean up
the flag usage from the codebase. But we should keep the flag
declaration because the flag is an exported flag.

Bug: b/409609485
Fix: b/409609485
Flag: EXEMPT removing com.android.media.flags.enable_rlp_callbacks_in_media_router2
Test: presubmit
FCRS_CODE: m9pi0jf7o9v2l2
Change-Id: Ibed2eb9028d14c76d8f030a5fc423a335abf94f1
parent 42733b04

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -25250,13 +25250,13 @@ package android.media { 
    method @FlaggedApi("com.android.media.flags.enable_suggested_device_api") @NonNull public java.util.Map<java.lang.String,java.util.List<android.media.SuggestedDeviceInfo>> getDeviceSuggestions();

    method @NonNull public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context);

    method @FlaggedApi("com.android.media.flags.enable_privileged_routing_for_media_routing_control") @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MEDIA_CONTENT_CONTROL, android.Manifest.permission.MEDIA_ROUTING_CONTROL}) public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull Runnable);

    method @FlaggedApi("com.android.media.flags.enable_rlp_callbacks_in_media_router2") @Nullable public android.media.RouteListingPreference getRouteListingPreference();

    method @Nullable public android.media.RouteListingPreference getRouteListingPreference();

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

    method @NonNull public android.media.MediaRouter2.RoutingController getSystemController();

    method public void registerControllerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaRouter2.ControllerCallback);

    method @FlaggedApi("com.android.media.flags.enable_suggested_device_api") public void registerDeviceSuggestionsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaRouter2.DeviceSuggestionsCallback);

    method public void registerRouteCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaRouter2.RouteCallback, @NonNull android.media.RouteDiscoveryPreference);

    method @FlaggedApi("com.android.media.flags.enable_rlp_callbacks_in_media_router2") public void registerRouteListingPreferenceUpdatedCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.media.RouteListingPreference>);

    method public void registerRouteListingPreferenceUpdatedCallback(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.media.RouteListingPreference>);

    method public void registerTransferCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaRouter2.TransferCallback);

    method @FlaggedApi("com.android.media.flags.enable_screen_off_scanning") @NonNull public android.media.MediaRouter2.ScanToken requestScan(@NonNull android.media.MediaRouter2.ScanRequest);

    method @FlaggedApi("com.android.media.flags.enable_suggested_device_api") public void setDeviceSuggestions(@NonNull java.util.List<android.media.SuggestedDeviceInfo>);
@@ -25269,7 +25269,7 @@ package android.media { 
    method public void unregisterControllerCallback(@NonNull android.media.MediaRouter2.ControllerCallback);

    method @FlaggedApi("com.android.media.flags.enable_suggested_device_api") public void unregisterDeviceSuggestionsCallback(@NonNull android.media.MediaRouter2.DeviceSuggestionsCallback);

    method public void unregisterRouteCallback(@NonNull android.media.MediaRouter2.RouteCallback);

    method @FlaggedApi("com.android.media.flags.enable_rlp_callbacks_in_media_router2") public void unregisterRouteListingPreferenceUpdatedCallback(@NonNull java.util.function.Consumer<android.media.RouteListingPreference>);

    method public void unregisterRouteListingPreferenceUpdatedCallback(@NonNull java.util.function.Consumer<android.media.RouteListingPreference>);

    method public void unregisterTransferCallback(@NonNull android.media.MediaRouter2.TransferCallback);

  }

























media/java/android/media/MediaRouter2.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -20,7 +20,6 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa













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















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















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













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;















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


























@@ -752,7 +751,6 @@ public final class MediaRouter2 {













     *















     * @see #setRouteListingPreference(RouteListingPreference)















     */













    @FlaggedApi(FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2)















    public void registerRouteListingPreferenceUpdatedCallback(















            @NonNull @CallbackExecutor Executor executor,















            @NonNull Consumer<RouteListingPreference> routeListingPreferenceCallback) {










@@ -791,7 +789,6 @@ public final class MediaRouter2 {













     *















     * @see #registerRouteListingPreferenceUpdatedCallback(Executor, Consumer)















     */













    @FlaggedApi(FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2)















    public void unregisterRouteListingPreferenceUpdatedCallback(















            @NonNull Consumer<RouteListingPreference> callback) {















        Objects.requireNonNull(callback, "callback must not be null");










@@ -921,7 +918,6 @@ public final class MediaRouter2 {













     *















     * @see #setRouteListingPreference(RouteListingPreference)















     */













    @FlaggedApi(FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2)















    @Nullable















    public RouteListingPreference getRouteListingPreference() {















        synchronized (mLock) {