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

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

Merge "Bind to system media MR2RouteProviders for any manager scans" into main

parents b2b28efd 8ed415bc
Loading
Loading
Loading
Loading
+12 −5
Original line number Diff line number Diff line
@@ -279,13 +279,20 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider {
        if (!mRunning) {
            return false;
        }
        boolean bindDueToManagerScan =
                mIsManagerScanning && !Flags.enablePreventionOfManagerScansWhenNoAppsScan();
        if (!getSessionInfos().isEmpty() || bindDueToManagerScan) {
        // We bind if any manager is scanning (regardless of whether an app is scanning) to give
        // the opportunity for providers to publish routing sessions that were established
        // directly between the app and the provider (typically via AndroidX MediaRouter). See
        // b/176774510#comment20 for more information.
        boolean bindDueToManagerScan =
                mIsManagerScanning && !Flags.enablePreventionOfManagerScansWhenNoAppsScan();
        // We also bind if this provider supports system media routing, because even if an app
        // doesn't have any registered discovery preference, we should still be able to route their
        // system media.
        boolean bindDueToSystemMediaRoutingSupport =
                mIsManagerScanning && mSupportsSystemMediaRouting;
        if (!getSessionInfos().isEmpty()
                || bindDueToManagerScan
                || bindDueToSystemMediaRoutingSupport) {
            return true;
        }
        boolean anAppIsScanning =