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

Commit f8121a4b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Put requestId first in notifySessionCreated() arguments" into rvc-dev am: fde3c9ac 

Change-Id: If80872e1128d65c43cda6ba13766f85100154ba4
parents ad7cace5 fde3c9ac

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26900,7 +26900,7 @@ package android.media { 
    method @Nullable public final android.media.RoutingSessionInfo getSessionInfo(@NonNull String);

    method public final void notifyRequestFailed(long, int);

    method public final void notifyRoutes(@NonNull java.util.Collection<android.media.MediaRoute2Info>);

    method public final void notifySessionCreated(@NonNull android.media.RoutingSessionInfo, long);

    method public final void notifySessionCreated(long, @NonNull android.media.RoutingSessionInfo);

    method public final void notifySessionReleased(@NonNull String);

    method public final void notifySessionUpdated(@NonNull android.media.RoutingSessionInfo);

    method @CallSuper @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);

media/java/android/media/IMediaRoute2ProviderService.aidl

+7 −7
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ oneway interface IMediaRoute2ProviderService { 
    // MediaRoute2ProviderService#MediaRoute2ProviderServiceStub for readability.

    void setCallback(IMediaRoute2ProviderServiceCallback callback);

    void updateDiscoveryPreference(in RouteDiscoveryPreference discoveryPreference);

    void setRouteVolume(String routeId, int volume, long requestId);

    void setRouteVolume(long requestId, String routeId, int volume);



    void requestCreateSession(String packageName, String routeId, long requestId,

    void requestCreateSession(long requestId, String packageName, String routeId,

            in @nullable Bundle sessionHints);

    void selectRoute(String sessionId, String routeId, long requestId);

    void deselectRoute(String sessionId, String routeId, long requestId);

    void transferToRoute(String sessionId, String routeId, long requestId);

    void setSessionVolume(String sessionId, int volume, long requestId);

    void releaseSession(String sessionId, long requestId);

    void selectRoute(long requestId, String sessionId, String routeId);

    void deselectRoute(long requestId, String sessionId, String routeId);

    void transferToRoute(long requestId, String sessionId, String routeId);

    void setSessionVolume(long requestId, String sessionId, int volume);

    void releaseSession(long requestId, String sessionId);

}

media/java/android/media/IMediaRoute2ProviderServiceCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.os.Bundle; 
oneway interface IMediaRoute2ProviderServiceCallback {

    // TODO: Change it to updateRoutes?

    void updateState(in MediaRoute2ProviderInfo providerInfo);

    void notifySessionCreated(in RoutingSessionInfo sessionInfo, long requestId);

    void notifySessionCreated(long requestId, in RoutingSessionInfo sessionInfo);

    void notifySessionUpdated(in RoutingSessionInfo sessionInfo);

    void notifySessionReleased(in RoutingSessionInfo sessionInfo);

    void notifyRequestFailed(long requestId, int reason);

media/java/android/media/IMediaRouter2.aidl

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ oneway interface IMediaRouter2 { 
    void notifyRoutesAdded(in List<MediaRoute2Info> routes);

    void notifyRoutesRemoved(in List<MediaRoute2Info> routes);

    void notifyRoutesChanged(in List<MediaRoute2Info> routes);

    void notifySessionCreated(in @nullable RoutingSessionInfo sessionInfo, int requestId);

    void notifySessionCreated(int requestId, in @nullable RoutingSessionInfo sessionInfo);

    void notifySessionInfoChanged(in RoutingSessionInfo sessionInfo);

    void notifySessionReleased(in RoutingSessionInfo sessionInfo);

}

media/java/android/media/IMediaRouterService.aidl

+15 −15
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ interface IMediaRouterService { 
            in RouteDiscoveryPreference preference);

    void setRouteVolumeWithRouter2(IMediaRouter2 router, in MediaRoute2Info route, int volume);



    void requestCreateSessionWithRouter2(IMediaRouter2 router, in MediaRoute2Info route,

            int requestId, in @nullable Bundle sessionHints);

    void requestCreateSessionWithRouter2(IMediaRouter2 router, int requestId,

            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,
@@ -70,18 +70,18 @@ interface IMediaRouterService { 
    List<RoutingSessionInfo> getActiveSessions(IMediaRouter2Manager manager);

    void registerManager(IMediaRouter2Manager manager, String packageName);

    void unregisterManager(IMediaRouter2Manager manager);

    void setRouteVolumeWithManager(IMediaRouter2Manager manager, in MediaRoute2Info route,

            int volume, int requestId);

    void setRouteVolumeWithManager(IMediaRouter2Manager manager, int requestId,

            in MediaRoute2Info route, int volume);



    void requestCreateSessionWithManager(IMediaRouter2Manager manager, String packageName,

            in @nullable MediaRoute2Info route, int requestId);

    void selectRouteWithManager(IMediaRouter2Manager manager, String sessionId,

            in MediaRoute2Info route, int requestId);

    void deselectRouteWithManager(IMediaRouter2Manager manager, String sessionId,

            in MediaRoute2Info route, int requestId);

    void transferToRouteWithManager(IMediaRouter2Manager manager, String sessionId,

            in MediaRoute2Info route, int requestId);

    void setSessionVolumeWithManager(IMediaRouter2Manager manager, String sessionId, int volume,

            int requestId);

    void releaseSessionWithManager(IMediaRouter2Manager manager, String sessionId, int requestId);

    void requestCreateSessionWithManager(IMediaRouter2Manager manager, int requestId,

            String packageName, in @nullable MediaRoute2Info route);

    void selectRouteWithManager(IMediaRouter2Manager manager, int requestId,

            String sessionId, in MediaRoute2Info route);

    void deselectRouteWithManager(IMediaRouter2Manager manager, int requestId,

            String sessionId, in MediaRoute2Info route);

    void transferToRouteWithManager(IMediaRouter2Manager manager, int requestId,

            String sessionId, in MediaRoute2Info route);

    void setSessionVolumeWithManager(IMediaRouter2Manager manager, int requestId,

            String sessionId, int volume);

    void releaseSessionWithManager(IMediaRouter2Manager manager, int requestId, String sessionId);

}