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

Commit a090aa24 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add flag to enable per-app mirroring in MR2" into main

parents c504d1d3 752e85bb

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

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

}



flag {

    name: "enable_per_app_mirroring_in_media_router_2"

    namespace: "media_better_together"

    description: "Enables MediaRouter2 app-specific mirroring. Requires enable_mirroring_in_media_router_2."

    bug: "413313659"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_prevention_of_keep_alive_route_providers"

    namespace: "media_solutions"

services/core/java/com/android/server/media/SystemMediaRoute2Provider2.java

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.util.Log; 
import android.util.LongSparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.media.flags.Flags;

import com.android.server.media.MediaRoute2ProviderServiceProxy.SystemMediaSessionCallback;



import java.util.Collections;
@@ -60,7 +61,8 @@ import java.util.stream.Stream; 


    private static final String UNIQUE_SYSTEM_ID_PREFIX = "SYSTEM";

    private static final String UNIQUE_SYSTEM_ID_SEPARATOR = "-";

    private static final boolean FORCE_GLOBAL_ROUTING_SESSION = true;

    private static final boolean FORCE_GLOBAL_ROUTING_SESSION =

            !Flags.enablePerAppMirroringInMediaRouter2();

    private static final String PACKAGE_NAME_FOR_GLOBAL_SESSION = "";



    /**