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

Commit 43a9f38d authored by Iván Budnik's avatar Iván Budnik Committed by Android (Google) Code Review
Browse files

Merge "Fix inconsistent system routing permission check" into main

parents eaf0c9d6 2a8c60a9

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -707,7 +707,8 @@ class MediaRouter2ServiceImpl { 
    }

    }





    private boolean checkCallerHasSystemRoutingPermissions(int pid, int uid) {

    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) {

    private boolean checkCallerHasModifyAudioRoutingPermission(int pid, int uid) {