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

Commit d6d0af2a authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Remove notifyDiscoveryPreferenceChangedToManager 

It's not needed: manager.notifyDiscoveryPreferenceChanged is equivalent
and equally simple

Bug: 360129098
Test: Manual simple casting flow using routing demo app
Flag: EXEMPT refactor
Change-Id: I15452142e8f1a3bd41ad02e656296410282ca636
parent d417e53b

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

+4 −15
Original line number Diff line number Diff line
@@ -1932,10 +1932,10 @@ class MediaRouter2ServiceImpl { 
            // How about removing mUserRecord from routerRecord?

            routerRecord.mUserRecord.mHandler.sendMessage(

                    obtainMessage(

                            UserHandler::notifyDiscoveryPreferenceChangedToManager,

                            routerRecord.mUserRecord.mHandler,

                            routerRecord,

                            manager));

                            ManagerRecord::notifyDiscoveryPreferenceChanged,

                            managerRecord,

                            routerRecord.mPackageName,

                            routerRecord.mDiscoveryPreference));

        }



        userRecord.mHandler.sendMessage(
@@ -4056,17 +4056,6 @@ class MediaRouter2ServiceImpl { 
            }

        }



        private void notifyDiscoveryPreferenceChangedToManager(@NonNull RouterRecord routerRecord,

                @NonNull IMediaRouter2Manager manager) {

            try {

                manager.notifyDiscoveryPreferenceChanged(routerRecord.mPackageName,

                        routerRecord.mDiscoveryPreference);

            } catch (RemoteException ex) {

                Slog.w(TAG, "Failed to notify preferred features changed."

                        + " Manager probably died.", ex);

            }

        }



        private void notifyDiscoveryPreferenceChangedToManagers(@NonNull String routerPackageName,

                @Nullable RouteDiscoveryPreference discoveryPreference) {

            synchronized (mLock) {