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

Commit f12a04e2 authored by Iván Budnik's avatar Iván Budnik
Browse files

Remove ignored call to onTransferred() and simplify checks 

onTransferred() only handles session creation events, while
onSessionUpdated() handles session updates.

This is a non-functional change.

Bug: 330300516
Test: atest SystemMediaRouter2Test ProxyMediaRouter2HostSideTest

Change-Id: I8744bdd5539509b4ed57385d0144e966f30974f2
parent e3677c8d

media/java/android/media/MediaRouter2.java

+5 −10
Original line number Diff line number Diff line
@@ -3141,11 +3141,6 @@ public final class MediaRouter2 { 
                return;

            }



            // For successful in-session transfer, onControllerUpdated() handles it.

            if (TextUtils.equals(oldSession.getId(), newSession.getId())) {

                return;

            }



            RoutingController oldController;

            if (oldSession.isSystemSession()) {

                mSystemController.setRoutingSessionInfo(
@@ -3237,19 +3232,19 @@ public final class MediaRouter2 { 
            }

        }



        private void onSessionUpdatedOnHandler(@NonNull RoutingSessionInfo sessionInfo) {

        private void onSessionUpdatedOnHandler(@NonNull RoutingSessionInfo updatedSession) {

            for (MediaRouter2Manager.TransferRequest request : mTransferRequests) {

                String sessionId = request.mOldSessionInfo.getId();

                if (!TextUtils.equals(sessionId, sessionInfo.getId())) {

                if (!TextUtils.equals(sessionId, updatedSession.getId())) {

                    continue;

                }

                if (sessionInfo.getSelectedRoutes().contains(request.mTargetRoute.getId())) {



                if (updatedSession.getSelectedRoutes().contains(request.mTargetRoute.getId())) {

                    mTransferRequests.remove(request);

                    this.onTransferred(request.mOldSessionInfo, sessionInfo);

                    break;

                }

            }

            this.onSessionUpdated(sessionInfo);

            this.onSessionUpdated(updatedSession);

        }



        private void onSessionReleasedOnHandler(@NonNull RoutingSessionInfo session) {