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

Commit f0053467 authored by Iván Budnik's avatar Iván Budnik Committed by Android (Google) Code Review
Browse files

Merge "Remove unused parameter on IMediaRouterService.aidl" into main

parents ca68c463 0067d893

media/java/android/media/IMediaRouterService.aidl

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ interface IMediaRouterService { 


    // Methods for MediaRouter2Manager

    List<RoutingSessionInfo> getRemoteSessions(IMediaRouter2Manager manager);

    RoutingSessionInfo getSystemSessionInfoForPackage(

            IMediaRouter2Manager manager, String packageName);

    RoutingSessionInfo getSystemSessionInfoForPackage(String packageName);

    void registerManager(IMediaRouter2Manager manager, String packageName);

    void unregisterManager(IMediaRouter2Manager manager);

    void setRouteVolumeWithManager(IMediaRouter2Manager manager, int requestId,

media/java/android/media/MediaRouter2.java

+1 −3
Original line number Diff line number Diff line
@@ -2059,9 +2059,7 @@ public final class MediaRouter2 { 
        public RoutingSessionInfo getSystemSessionInfo() {

            RoutingSessionInfo result;

            try {

                result =

                        mMediaRouterService.getSystemSessionInfoForPackage(

                                mClient, mClientPackageName);

                result = mMediaRouterService.getSystemSessionInfoForPackage(mClientPackageName);

            } catch (RemoteException ex) {

                throw ex.rethrowFromSystemServer();

            }

media/java/android/media/MediaRouter2Manager.java

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ public final class MediaRouter2Manager { 
    @Nullable

    public RoutingSessionInfo getSystemRoutingSession(@Nullable String packageName) {

        try {

            return mMediaRouterService.getSystemSessionInfoForPackage(mClient, packageName);

            return mMediaRouterService.getSystemSessionInfoForPackage(packageName);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -515,8 +515,7 @@ public final class MediaRouterService extends IMediaRouterService.Stub 


    // Binder call

    @Override

    public RoutingSessionInfo getSystemSessionInfoForPackage(IMediaRouter2Manager manager,

            String packageName) {

    public RoutingSessionInfo getSystemSessionInfoForPackage(@Nullable String packageName) {

        final int uid = Binder.getCallingUid();

        final int userId = UserHandle.getUserHandleForUid(uid).getIdentifier();

        boolean setDeviceRouteSelected = false;