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

Commit 04e35853 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

MediaRouterService binds services when necessary 

MediaRouterService maintained bindings to provider services
once those are established.

With this CL, it only binds services when there is a non-empty
discovery preference set by a foreground app or an app is casting.

MediaRouter2Manager#startScan and #stopScan are added
so that system UI can force the service bind to the services and find
remote devices to cast.

Bug: 169575701
Bug: 172920557

Test: manually and CTS
Change-Id: I4a47fdb1c9fe05a04d26950485833c9cbfb91a69
(cherry picked from commit 9f889ca4)
(cherry picked from commit 602b168f)
parent 4064d2da

media/java/android/media/IMediaRouterService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ interface IMediaRouterService { 
    void unregisterManager(IMediaRouter2Manager manager);

    void setRouteVolumeWithManager(IMediaRouter2Manager manager, int requestId,

            in MediaRoute2Info route, int volume);

    void startScan(IMediaRouter2Manager manager);

    void stopScan(IMediaRouter2Manager manager);



    void requestCreateSessionWithManager(IMediaRouter2Manager manager, int requestId,

            in RoutingSessionInfo oldSession, in @nullable MediaRoute2Info route);

media/java/android/media/MediaRouter2Manager.java

+30 −0
Original line number Diff line number Diff line
@@ -146,6 +146,36 @@ public final class MediaRouter2Manager { 
        }

    }



    /**

     * Starts scanning remote routes.

     * @see #stopScan(String)

     */

    public void startScan() {

        Client client = getOrCreateClient();

        if (client != null) {

            try {

                mMediaRouterService.startScan(client);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to get sessions. Service probably died.", ex);

            }

        }

    }



    /**

     * Stops scanning remote routes to reduce resource consumption.

     * @see #startScan(String)

     */

    public void stopScan() {

        Client client = getOrCreateClient();

        if (client != null) {

            try {

                mMediaRouterService.stopScan(client);

            } catch (RemoteException ex) {

                Log.e(TAG, "Unable to get sessions. Service probably died.", ex);

            }

        }

    }



    /**

     * Gets a {@link android.media.session.MediaController} associated with the

     * given routing session.

media/java/android/media/RouteDiscoveryPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ public final class RouteDiscoveryPreference implements Parcelable { 
            return false;

        }

        RouteDiscoveryPreference other = (RouteDiscoveryPreference) o;

        //TODO: Make this order-free

        return Objects.equals(mPreferredFeatures, other.mPreferredFeatures)

                && mShouldPerformActiveScan == other.mShouldPerformActiveScan;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ abstract class MediaRoute2Provider { 
    @NonNull

    public List<RoutingSessionInfo> getSessionInfos() {

        synchronized (mLock) {

            return mSessionInfos;

            return new ArrayList<>(mSessionInfos);

        }

    }

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

+5 −3
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
        mLastDiscoveryPreference = discoveryPreference;

        if (mConnectionReady) {

            mActiveConnection.updateDiscoveryPreference(discoveryPreference);

            updateBinding();

        }

        updateBinding();

    }



    @Override
@@ -205,9 +205,11 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 
    }



    private boolean shouldBind() {

        //TODO: Binding could be delayed until it's necessary.

        if (mRunning) {

            return true;

            // Bind when there is a discovery preference or an active route session.

            return (mLastDiscoveryPreference != null

                    && !mLastDiscoveryPreference.getPreferredFeatures().isEmpty())

                    || !getSessionInfos().isEmpty();

        }

        return false;

    }