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

Commit c07823ad authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Prevent apps from publishing system routes" into main

parents 55d70b9b 59fc86fd

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

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Intent; 
import android.content.ServiceConnection;

import android.media.IMediaRoute2ProviderService;

import android.media.IMediaRoute2ProviderServiceCallback;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2ProviderInfo;

import android.media.MediaRoute2ProviderService;

import android.media.RouteDiscoveryPreference;
@@ -641,6 +642,15 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider 


        @Override

        public void notifyProviderUpdated(MediaRoute2ProviderInfo providerInfo) {

            for (MediaRoute2Info route : providerInfo.getRoutes()) {

                if (route.isSystemRoute()) {

                    throw new SecurityException(

                            "Only the system is allowed to publish system routes. "

                                    + "Disallowed route: "

                                    + route);

                }

            }



            Connection connection = mConnectionRef.get();

            if (connection != null) {

                connection.postProviderUpdated(providerInfo);