Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioService: add missing permission checks in Bluetooth related code am: de3a4084b2" into sc-qpr1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2021-08-31 23:46:28 +00:00
committed by Android (Google) Code Review
parent 550f797d45 53ba716e72
commit 1e18d02f3c
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -5295,6 +5295,10 @@ public class AudioService extends IAudioService.Stub
// TODO investigate internal users due to deprecation of SDK API // TODO investigate internal users due to deprecation of SDK API
/** @see AudioManager#setBluetoothA2dpOn(boolean) */ /** @see AudioManager#setBluetoothA2dpOn(boolean) */
public void setBluetoothA2dpOn(boolean on) { public void setBluetoothA2dpOn(boolean on) {
if (!checkAudioSettingsPermission("setBluetoothA2dpOn()")) {
return;
}
// for logging only // for logging only
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
final int pid = Binder.getCallingPid(); final int pid = Binder.getCallingPid();
@@ -5320,6 +5324,10 @@ public class AudioService extends IAudioService.Stub
/** @see AudioManager#startBluetoothSco() */ /** @see AudioManager#startBluetoothSco() */
public void startBluetoothSco(IBinder cb, int targetSdkVersion) { public void startBluetoothSco(IBinder cb, int targetSdkVersion) {
if (!checkAudioSettingsPermission("startBluetoothSco()")) {
return;
}
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
final int pid = Binder.getCallingPid(); final int pid = Binder.getCallingPid();
final int scoAudioMode = final int scoAudioMode =
@@ -5342,6 +5350,10 @@ public class AudioService extends IAudioService.Stub
/** @see AudioManager#startBluetoothScoVirtualCall() */ /** @see AudioManager#startBluetoothScoVirtualCall() */
public void startBluetoothScoVirtualCall(IBinder cb) { public void startBluetoothScoVirtualCall(IBinder cb) {
if (!checkAudioSettingsPermission("startBluetoothScoVirtualCall()")) {
return;
}
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
final int pid = Binder.getCallingPid(); final int pid = Binder.getCallingPid();
final String eventSource = new StringBuilder("startBluetoothScoVirtualCall()") final String eventSource = new StringBuilder("startBluetoothScoVirtualCall()")