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

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

Merge "Add additional logs for session creation" into main

parents d795d955 dfd346dd

media/java/android/media/MediaRouter2.java

+5 −0
Original line number Diff line number Diff line
@@ -985,6 +985,11 @@ public final class MediaRouter2 { 


    void onRequestCreateControllerByManagerOnHandler(

            RoutingSessionInfo oldSession, MediaRoute2Info route, long managerRequestId) {

        Log.i(

                TAG,

                TextUtils.formatSimple(

                        "requestCreateSessionByManager | requestId: %d, oldSession: %s, route: %s",

                        managerRequestId, oldSession, route));

        RoutingController controller;

        if (oldSession.isSystemSession()) {

            controller = getSystemController();

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

+9 −4
Original line number Diff line number Diff line
@@ -1291,13 +1291,18 @@ class MediaRouter2ServiceImpl { 
        }



        long uniqueRequestId = toUniqueRequestId(managerRecord.mManagerId, requestId);

        if (managerRecord.mLastSessionCreationRequest != null) {

        SessionCreationRequest lastRequest = managerRecord.mLastSessionCreationRequest;

        if (lastRequest != null) {

            Slog.i(

                    TAG,

                    TextUtils.formatSimple(

                            "requestCreateSessionWithManagerLocked: Notifying failure for pending"

                                + " session creation request - oldSession: %s, route: %s",

                            lastRequest.mOldSession, lastRequest.mRoute));

            managerRecord.mUserRecord.mHandler.notifyRequestFailedToManager(

                    managerRecord.mManager,

                    toOriginalRequestId(managerRecord.mLastSessionCreationRequest

                            .mManagerRequestId),

                    toOriginalRequestId(lastRequest.mManagerRequestId),

                    REASON_UNKNOWN_ERROR);

            managerRecord.mLastSessionCreationRequest = null;

        }

        managerRecord.mLastSessionCreationRequest = new SessionCreationRequest(routerRecord,

                MediaRoute2ProviderService.REQUEST_ID_NONE, uniqueRequestId,