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

Commit 3c480a95 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "MediaRouter2: Call onTransferred when Cast -> BT." into rvc-dev am: 52a07890 

Change-Id: Ia591ccb98f2e0ff747e89e9cc1a78bc4ed4b1449
parents d26355b0 52a07890

media/java/android/media/MediaRouter2.java

+10 −5
Original line number Diff line number Diff line
@@ -419,8 +419,7 @@ public final class MediaRouter2 { 


        controller.release();



        final int requestId;

        requestId = mControllerCreationRequestCnt.getAndIncrement();

        final int requestId = mControllerCreationRequestCnt.getAndIncrement();



        ControllerCreationRequest request =

                new ControllerCreationRequest(requestId, controller, route);
@@ -610,10 +609,16 @@ public final class MediaRouter2 { 
        }



        if (sessionInfo != null) {

            RoutingController newController = new RoutingController(sessionInfo);

            RoutingController newController;

            if (sessionInfo.isSystemSession()) {

                newController = getSystemController();

            } else {

                newController = new RoutingController(sessionInfo);

                synchronized (sRouterLock) {

                    mRoutingControllers.put(newController.getId(), newController);

                }

            }

            //TODO: Determine oldController properly when transfer is launched by Output Switcher.

            notifyTransferred(matchingRequest != null ? matchingRequest.mController :

                    getSystemController(), newController);

        }

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

+4 −2
Original line number Diff line number Diff line
@@ -127,8 +127,10 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
    @Override

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

            Bundle sessionHints) {

        // Handle it as an internal transfer.



        transferToRoute(requestId, SYSTEM_SESSION_ID, routeId);

        mCallback.onSessionCreated(this, requestId, mSessionInfos.get(0));

        //TODO: We should call after the session info is changed.

    }



    @Override
@@ -240,7 +242,6 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
            builder.addTransferableRoute(route.getId());

        }





        RoutingSessionInfo newSessionInfo = builder.setProviderId(mUniqueId).build();

        if (Objects.equals(oldSessionInfo, newSessionInfo)) {

            return false;
@@ -261,6 +262,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
        synchronized (mLock) {

            sessionInfo = mSessionInfos.get(0);

        }



        mCallback.onSessionUpdated(this, sessionInfo);

    }