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

Commit fa248a71 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Prevent MediaRouter2 w/o permission from getting DEVICE_ROUTE 

Bug: 156339277
Test: Checked the logs which shows that DEVICE_ROUTE doesn't come.
      Also passed the existing CTS tests.
Change-Id: Iec694a7abae8a1550221135192775180e735ed19
parent 15cd47ed

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

+24 −3
Original line number Original line Diff line number Diff line
@@ -584,7 +584,8 @@ class MediaRouter2ServiceImpl { 
        mAllRouterRecords.put(binder, routerRecord);

        mAllRouterRecords.put(binder, routerRecord);





        userRecord.mHandler.sendMessage(

        userRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::notifyRoutesToRouter, userRecord.mHandler, router));

                obtainMessage(UserHandler::notifyRoutesToRouter,

                        userRecord.mHandler, routerRecord));

    }

    }





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

    private void unregisterRouter2Locked(@NonNull IMediaRouter2 router, boolean died) {
@@ -1775,16 +1776,36 @@ class MediaRouter2ServiceImpl { 
            }

            }

        }

        }





        private void notifyRoutesToRouter(@NonNull IMediaRouter2 router) {

        private void notifyRoutesToRouter(@NonNull RouterRecord routerRecord) {

            List<MediaRoute2Info> routes = new ArrayList<>();

            List<MediaRoute2Info> routes = new ArrayList<>();



            MediaRoute2ProviderInfo systemProviderInfo = null;

            for (MediaRoute2ProviderInfo providerInfo : mLastProviderInfos) {

            for (MediaRoute2ProviderInfo providerInfo : mLastProviderInfos) {

                // TODO: Create MediaRoute2ProviderInfo#isSystemProvider()

                if (TextUtils.equals(providerInfo.getUniqueId(), mSystemProvider.getUniqueId())) {

                    // Adding routes from system provider will be handled below, so skip it here.

                    systemProviderInfo = providerInfo;

                    continue;

                }

                routes.addAll(providerInfo.getRoutes());

                routes.addAll(providerInfo.getRoutes());

            }

            }



            if (routerRecord.mHasModifyAudioRoutingPermission) {

                if (systemProviderInfo != null) {

                    routes.addAll(systemProviderInfo.getRoutes());

                } else {

                    // This shouldn't happen.

                    Slog.w(TAG, "notifyRoutesToRouter: System route provider not found.");

                }

            } else {

                routes.add(mSystemProvider.getDefaultRoute());

            }



            if (routes.size() == 0) {

            if (routes.size() == 0) {

                return;

                return;

            }

            }

            try {

            try {

                router.notifyRoutesAdded(routes);

                routerRecord.mRouter.notifyRoutesAdded(routes);

            } catch (RemoteException ex) {

            } catch (RemoteException ex) {

                Slog.w(TAG, "Failed to notify all routes. Router probably died.", ex);

                Slog.w(TAG, "Failed to notify all routes. Router probably died.", ex);

            }

            }