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

Commit 2a8c60a9 authored by Iván Budnik's avatar Iván Budnik
Browse files

Fix inconsistent system routing permission check 

MR2ServiceImpl was not checking for BT permissions when granting access
to system routing to routing clients on some cases.

Bug: 298338671
Test: MediaRouter2Test MediaRouter2HostSideTest
Change-Id: Iac9986bc37c78c49b6feb3b31e47cff2702a9c2c
parent 03021851

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

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.content.Intent.ACTION_SCREEN_ON; 
import static android.media.MediaRoute2ProviderService.REASON_UNKNOWN_ERROR;

import static android.media.MediaRouter2Utils.getOriginalId;

import static android.media.MediaRouter2Utils.getProviderId;



import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

import static com.android.server.media.MediaFeatureFlagManager.FEATURE_SCANNING_MINIMUM_PACKAGE_IMPORTANCE;
@@ -705,7 +706,8 @@ class MediaRouter2ServiceImpl { 
    }



    private boolean checkCallerHasSystemRoutingPermissions(int pid, int uid) {

        return checkCallerHasModifyAudioRoutingPermission(pid, uid);

        return checkCallerHasModifyAudioRoutingPermission(pid, uid)

                || checkCallerHasBluetoothPermissions(pid, uid);

    }



    private boolean checkCallerHasModifyAudioRoutingPermission(int pid, int uid) {