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

Commit d8821093 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Add MediaRoute2ProviderService#notifyRequestFailed"

parents d1890075 0fa60e88

api/current.txt

+14 −8
Original line number Diff line number Diff line
@@ -26899,21 +26899,27 @@ package android.media { 
    ctor public MediaRoute2ProviderService();

    method @NonNull public final java.util.List<android.media.RoutingSessionInfo> getAllSessionInfo();

    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 notifySessionCreationFailed(long);

    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);

    method public abstract void onCreateSession(@NonNull String, @NonNull String, long, @Nullable android.os.Bundle);

    method public abstract void onDeselectRoute(@NonNull String, @NonNull String);

    method public abstract void onCreateSession(long, @NonNull String, @NonNull String, @Nullable android.os.Bundle);

    method public abstract void onDeselectRoute(long, @NonNull String, @NonNull String);

    method public void onDiscoveryPreferenceChanged(@NonNull android.media.RouteDiscoveryPreference);

    method public abstract void onReleaseSession(@NonNull String);

    method public abstract void onSelectRoute(@NonNull String, @NonNull String);

    method public abstract void onSetRouteVolume(@NonNull String, int);

    method public abstract void onSetSessionVolume(@NonNull String, int);

    method public abstract void onTransferToRoute(@NonNull String, @NonNull String);

    field public static final long REQUEST_ID_UNKNOWN = 0L; // 0x0L

    method public abstract void onReleaseSession(long, @NonNull String);

    method public abstract void onSelectRoute(long, @NonNull String, @NonNull String);

    method public abstract void onSetRouteVolume(long, @NonNull String, int);

    method public abstract void onSetSessionVolume(long, @NonNull String, int);

    method public abstract void onTransferToRoute(long, @NonNull String, @NonNull String);

    field public static final int REASON_INVALID_COMMAND = 4; // 0x4

    field public static final int REASON_NETWORK_ERROR = 2; // 0x2

    field public static final int REASON_REJECTED = 1; // 0x1

    field public static final int REASON_ROUTE_NOT_AVAILABLE = 3; // 0x3

    field public static final int REASON_UNKNOWN_ERROR = 0; // 0x0

    field public static final long REQUEST_ID_NONE = 0L; // 0x0L

    field public static final String SERVICE_INTERFACE = "android.media.MediaRoute2ProviderService";

  }

























media/java/android/media/IMediaRoute2ProviderService.aidl



+6
−6




























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);













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































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















            in @nullable Bundle sessionHints);













    void selectRoute(String sessionId, String routeId);













    void deselectRoute(String sessionId, String routeId);













    void transferToRoute(String sessionId, String routeId);













    void setSessionVolume(String sessionId, int volume);













    void releaseSession(String sessionId);













    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);















}
























media/java/android/media/IMediaRoute2ProviderServiceCallback.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -31,4 +31,5 @@ oneway interface IMediaRoute2ProviderServiceCallback {













    void notifySessionCreationFailed(long requestId);















    void notifySessionUpdated(in RoutingSessionInfo sessionInfo);















    void notifySessionReleased(in RoutingSessionInfo sessionInfo);













    void notifyRequestFailed(long requestId, int reason);















}
























media/java/android/media/IMediaRouter2Manager.aidl



+1
−0




























Original line number
Diff line number
Diff line








@@ -30,4 +30,5 @@ oneway interface IMediaRouter2Manager {













    void notifyRoutesAdded(in List<MediaRoute2Info> routes);















    void notifyRoutesRemoved(in List<MediaRoute2Info> routes);















    void notifyRoutesChanged(in List<MediaRoute2Info> routes);













    void notifyRequestFailed(int requestId, int reason);















}
























media/java/android/media/IMediaRouterService.aidl



+7
−6




























Original line number
Diff line number
Diff line








@@ -71,16 +71,17 @@ interface IMediaRouterService {













    void registerManager(IMediaRouter2Manager manager, String packageName);















    void unregisterManager(IMediaRouter2Manager manager);















    void setRouteVolumeWithManager(IMediaRouter2Manager manager, in MediaRoute2Info route,













            int volume);













            int volume, int requestId);































    void requestCreateSessionWithManager(IMediaRouter2Manager manager, String packageName,















            in @nullable MediaRoute2Info route, int requestId);















    void selectRouteWithManager(IMediaRouter2Manager manager, String sessionId,













            in MediaRoute2Info route);













            in MediaRoute2Info route, int requestId);















    void deselectRouteWithManager(IMediaRouter2Manager manager, String sessionId,













            in MediaRoute2Info route);













            in MediaRoute2Info route, int requestId);















    void transferToRouteWithManager(IMediaRouter2Manager manager, String sessionId,













            in MediaRoute2Info route);













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













    void releaseSessionWithManager(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);















}