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

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

Merge "Improve logs for unregistering routers and managers" into main

parents 2b69ef7b 37b64854

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

+18 −8
Original line number Original line Diff line number Diff line
@@ -837,15 +837,18 @@ class MediaRouter2ServiceImpl { 
    private void unregisterRouter2Locked(@NonNull IMediaRouter2 router, boolean died) {

    private void unregisterRouter2Locked(@NonNull IMediaRouter2 router, boolean died) {

        RouterRecord routerRecord = mAllRouterRecords.remove(router.asBinder());

        RouterRecord routerRecord = mAllRouterRecords.remove(router.asBinder());

        if (routerRecord == null) {

        if (routerRecord == null) {

            Slog.w(TAG, "Ignoring unregistering unknown router2");

            Slog.w(

                    TAG,

                    TextUtils.formatSimple(

                            "Ignoring unregistering unknown router: %s, died: %b", router, died));

            return;

            return;

        }

        }





        Slog.i(

        Slog.i(

                TAG,

                TAG,

                TextUtils.formatSimple(

                TextUtils.formatSimple(

                        "unregisterRouter2 | package: %s, router id: %d",

                        "unregisterRouter2 | package: %s, router id: %d, died: %b",

                        routerRecord.mPackageName, routerRecord.mRouterId));

                        routerRecord.mPackageName, routerRecord.mRouterId, died));





        UserRecord userRecord = routerRecord.mUserRecord;

        UserRecord userRecord = routerRecord.mUserRecord;

        userRecord.mRouterRecords.remove(routerRecord);

        userRecord.mRouterRecords.remove(routerRecord);
@@ -1230,15 +1233,22 @@ class MediaRouter2ServiceImpl { 
    private void unregisterManagerLocked(@NonNull IMediaRouter2Manager manager, boolean died) {

    private void unregisterManagerLocked(@NonNull IMediaRouter2Manager manager, boolean died) {

        ManagerRecord managerRecord = mAllManagerRecords.remove(manager.asBinder());

        ManagerRecord managerRecord = mAllManagerRecords.remove(manager.asBinder());

        if (managerRecord == null) {

        if (managerRecord == null) {

            Slog.w(

                    TAG,

                    TextUtils.formatSimple(

                            "Ignoring unregistering unknown manager: %s, died: %b", manager, died));

            return;

            return;

        }

        }

        UserRecord userRecord = managerRecord.mUserRecord;

        UserRecord userRecord = managerRecord.mUserRecord;





        Slog.i(TAG, TextUtils.formatSimple(

        Slog.i(

                "unregisterManager | package: %s, user: %d, manager: %d",

                TAG,

                TextUtils.formatSimple(

                        "unregisterManager | package: %s, user: %d, manager: %d, died: %b",

                        managerRecord.mOwnerPackageName,

                        managerRecord.mOwnerPackageName,

                        userRecord.mUserId,

                        userRecord.mUserId,

                managerRecord.mManagerId));

                        managerRecord.mManagerId,

                        died));





        userRecord.mManagerRecords.remove(managerRecord);

        userRecord.mManagerRecords.remove(managerRecord);

        managerRecord.dispose();

        managerRecord.dispose();