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

Commit 1e18d02f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "AudioService: add missing permission checks in Bluetooth related code... 

Merge "AudioService: add missing permission checks in Bluetooth related code am: de3a4084" into sc-qpr1-dev-plus-aosp
parents 550f797d 53ba716e

services/core/java/com/android/server/audio/AudioService.java

+12 −0
Original line number Diff line number Diff line
@@ -5295,6 +5295,10 @@ public class AudioService extends IAudioService.Stub 
    // TODO investigate internal users due to deprecation of SDK API

    /** @see AudioManager#setBluetoothA2dpOn(boolean) */

    public void setBluetoothA2dpOn(boolean on) {

        if (!checkAudioSettingsPermission("setBluetoothA2dpOn()")) {

            return;

        }



        // for logging only

        final int uid = Binder.getCallingUid();

        final int pid = Binder.getCallingPid();
@@ -5320,6 +5324,10 @@ public class AudioService extends IAudioService.Stub 


    /** @see AudioManager#startBluetoothSco() */

    public void startBluetoothSco(IBinder cb, int targetSdkVersion) {

        if (!checkAudioSettingsPermission("startBluetoothSco()")) {

            return;

        }



        final int uid = Binder.getCallingUid();

        final int pid = Binder.getCallingPid();

        final int scoAudioMode =
@@ -5342,6 +5350,10 @@ public class AudioService extends IAudioService.Stub 


    /** @see AudioManager#startBluetoothScoVirtualCall() */

    public void startBluetoothScoVirtualCall(IBinder cb) {

        if (!checkAudioSettingsPermission("startBluetoothScoVirtualCall()")) {

            return;

        }



        final int uid = Binder.getCallingUid();

        final int pid = Binder.getCallingPid();

        final String eventSource = new StringBuilder("startBluetoothScoVirtualCall()")