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

Commit 33b673c1 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Create ManagerRecord#notifySessionUpdated 

This change is part of a series of non-functional refactors to
encapsulate binder operations in the record that corresponds to the
target binder object. The objective is to improve the logging associated
with binder failures by adding information that's available in the
record. For example: Package names and ids.

Bug: 360129098
Test: atest CtsMediaBetterTogetherTestCases MediaRouter2HostSideTest
Flag: EXEMPT refactor
Change-Id: I9a91fa8bafaceed50ededf9f81b6c1db22412e5e
parent 945a81b5

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

+20 −29
Original line number Diff line number Diff line
@@ -2448,6 +2448,22 @@ class MediaRouter2ServiceImpl { 
            }

        }



        /**

         * Notifies the corresponding manager of an update in the given session.

         *

         * @param sessionInfo The updated session info.

         */

        public void notifySessionUpdated(RoutingSessionInfo sessionInfo) {

            try {

                mManager.notifySessionUpdated(sessionInfo);

            } catch (RemoteException ex) {

                Slog.w(

                        TAG,

                        "notifySessionUpdatedToManagers: Failed to notify. Manager probably died.",

                        ex);

            }

        }



        /**

         * Notifies the corresponding manager that the given session has been released.

         *
@@ -3101,8 +3117,10 @@ class MediaRouter2ServiceImpl { 


        private void onSessionInfoChangedOnHandler(@NonNull MediaRoute2Provider provider,

                @NonNull RoutingSessionInfo sessionInfo) {

            List<IMediaRouter2Manager> managers = getManagers();

            notifySessionUpdatedToManagers(managers, sessionInfo);

            List<ManagerRecord> managers = getManagerRecords();

            for (ManagerRecord manager : managers) {

                manager.notifySessionUpdated(sessionInfo);

            }



            // For system provider, notify all routers.

            if (provider == mSystemProvider) {
@@ -3204,20 +3222,6 @@ class MediaRouter2ServiceImpl { 
            return true;

        }



        private List<IMediaRouter2Manager> getManagers() {

            final List<IMediaRouter2Manager> managers = new ArrayList<>();

            MediaRouter2ServiceImpl service = mServiceRef.get();

            if (service == null) {

                return managers;

            }

            synchronized (service.mLock) {

                for (ManagerRecord managerRecord : mUserRecord.mManagerRecords) {

                    managers.add(managerRecord.mManager);

                }

            }

            return managers;

        }



        private List<RouterRecord> getRouterRecords() {

            MediaRouter2ServiceImpl service = mServiceRef.get();

            if (service == null) {
@@ -3321,19 +3325,6 @@ class MediaRouter2ServiceImpl { 
            }

        }



        private void notifySessionUpdatedToManagers(

                @NonNull List<IMediaRouter2Manager> managers,

                @NonNull RoutingSessionInfo sessionInfo) {

            for (IMediaRouter2Manager manager : managers) {

                try {

                    manager.notifySessionUpdated(sessionInfo);

                } catch (RemoteException ex) {

                    Slog.w(TAG, "notifySessionUpdatedToManagers: "

                            + "Failed to notify. Manager probably died.", ex);

                }

            }

        }



        private void notifyDiscoveryPreferenceChangedToManager(@NonNull RouterRecord routerRecord,

                @NonNull IMediaRouter2Manager manager) {

            try {