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

Commit c9430ba8 authored by Shenqiu Zhang's avatar Shenqiu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Cleanup the flag fix_transfer_from_user_route_to_unselected_system_route" into main

parents 997cc66f aeff57b3

media/java/android/media/MediaRouter2.java

+2 −3
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ public final class MediaRouter2 { 
            @NonNull MediaRoute2Info route,

            long managerRequestId) {



        if (Flags.fixTransferFromUserRouteToUnselectedSystemRoute() && route.isSystemRoute()) {

        if (route.isSystemRoute()) {

            notifyTransfer(controller, getSystemController());

            controller.release();

            return;
@@ -3065,8 +3065,7 @@ public final class MediaRouter2 { 
            } else {

                RoutingSessionInfo systemSessionInfo = mSystemController.getRoutingSessionInfo();

                boolean isTransferFromUserRouteToUnselectedSystemRoute =

                        Flags.fixTransferFromUserRouteToUnselectedSystemRoute()

                                && !sessionInfo.isSystemSession()

                        !sessionInfo.isSystemSession()

                                && route.isSystemRoute()

                                && !systemSessionInfo.getSelectedRoutes().contains(route.getId());

                if (isTransferFromUserRouteToUnselectedSystemRoute) {

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

+0 −10
Original line number Diff line number Diff line
@@ -297,16 +297,6 @@ flag { 
    bug: "338479898"

}



flag {

    name: "fix_transfer_from_user_route_to_unselected_system_route"

    namespace: "media_better_together"

    description: "Fixes a bug causing the failure of transferring to a builtin speaker."

    bug: "398527989"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "hide_bt_address_from_apps_without_bt_permission"

    namespace: "media_better_together"