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

Commit 2a4aba32 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "MediaRouter: Cleanup MediaRouter2Manager APIs" into rvc-dev am: f8ac47cd 

Change-Id: I0584908395b8c30b1c1d9363ae33e908ac5dfbdd
parents c737e852 f8ac47cd

media/java/android/media/MediaRouter2.java

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ public class MediaRouter2 { 
                try {

                    mMediaRouterService.deselectRouteWithRouter2(stub, getId(), route);

                } catch (RemoteException ex) {

                    Log.e(TAG, "Unable to remove route from session.", ex);

                    Log.e(TAG, "Unable to deselect route from session.", ex);

                }

            }

        }

media/java/android/media/MediaRouter2Manager.java

+307 −170

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/RoutingSessionInfo.java

+12 −1

File changed.

Preview size limit exceeded, changes collapsed.

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+5 −7

File changed.

Preview size limit exceeded, changes collapsed.