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

Commit 2ba93828 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "MediaRouter: Defer releasing routing controller when transfer" into...

Merge "MediaRouter: Defer releasing routing controller when transfer" into rvc-dev am: 82ff3f14 am: 31353b7e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593494

Change-Id: Ia0a591f917c39272ca20c3bc9f28b4c76b9042a6
parents 372761e8 31353b7e
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ oneway interface IMediaRouter2 {
    void notifySessionReleased(in RoutingSessionInfo sessionInfo);
    /**
     * Gets hints of the new session for the given route.
     * Call MediaRouterService#notifySessionHintsForCreatingSession to pass the result.
     * Call MediaRouterService#requestCreateSessionWithRouter2 to pass the result.
     */
    void getSessionHintsForCreatingSession(long uniqueRequestId, in MediaRoute2Info route);
    void requestCreateSessionByManager(long uniqueRequestId, in RoutingSessionInfo oldSession,
        in MediaRoute2Info route);
}
+5 −6
Original line number Diff line number Diff line
@@ -57,10 +57,9 @@ interface IMediaRouterService {
            in RouteDiscoveryPreference preference);
    void setRouteVolumeWithRouter2(IMediaRouter2 router, in MediaRoute2Info route, int volume);

    void requestCreateSessionWithRouter2(IMediaRouter2 router, int requestId,
            in MediaRoute2Info route, in @nullable Bundle sessionHints);
    void notifySessionHintsForCreatingSession(IMediaRouter2 router, long uniqueRequestId,
                in MediaRoute2Info route, in @nullable Bundle sessionHints);
    void requestCreateSessionWithRouter2(IMediaRouter2 router, int requestId, long managerRequestId,
            in RoutingSessionInfo oldSession, in MediaRoute2Info route,
            in @nullable Bundle sessionHints);
    void selectRouteWithRouter2(IMediaRouter2 router, String sessionId, in MediaRoute2Info route);
    void deselectRouteWithRouter2(IMediaRouter2 router, String sessionId, in MediaRoute2Info route);
    void transferToRouteWithRouter2(IMediaRouter2 router, String sessionId,
@@ -76,7 +75,7 @@ interface IMediaRouterService {
            in MediaRoute2Info route, int volume);

    void requestCreateSessionWithManager(IMediaRouter2Manager manager, int requestId,
            String packageName, in @nullable MediaRoute2Info route);
            in RoutingSessionInfo oldSession, in @nullable MediaRoute2Info route);
    void selectRouteWithManager(IMediaRouter2Manager manager, int requestId,
            String sessionId, in MediaRoute2Info route);
    void deselectRouteWithManager(IMediaRouter2Manager manager, int requestId,
Loading