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

Merge "remove AudioManager.setParameters from bluetooth" am: ec9a8515d7 am: c3be61fbd6 am: 0cc39d8e29

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859354

Change-Id: I2a8f73452b45554f7cdaffc9846418664049eee7
This commit is contained in:
Treehugger Robot
2021-11-03 17:50:20 +00:00
committed by Automerger Merge Worker
parent f8fc935a16 0cc39d8e29
commit f6d9afa480
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/module-lib-current.txt
View File

@@ -113,6 +113,11 @@ package android.media {
public class AudioManager { public class AudioManager {
method public void adjustStreamVolumeForUid(int, int, int, @NonNull String, int, int, int); method public void adjustStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);
method public void adjustSuggestedStreamVolumeForUid(int, int, int, @NonNull String, int, int, int); method public void adjustSuggestedStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);
method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setA2dpSuspended(boolean);
method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setBluetoothHeadsetProperties(@NonNull String, boolean, boolean);
method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpEnabled(boolean);
method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpSamplingRate(int);
method @RequiresPermission("android.permission.BLUETOOTH_STACK") public void setHfpVolume(int);
method public void setStreamVolumeForUid(int, int, int, @NonNull String, int, int, int); method public void setStreamVolumeForUid(int, int, int, @NonNull String, int, int, int);
field public static final int FLAG_FROM_KEY = 4096; // 0x1000 field public static final int FLAG_FROM_KEY = 4096; // 0x1000
} }

48
media/java/android/media/AudioManager.java
View File

@@ -3254,6 +3254,54 @@ public class AudioManager {
AudioSystem.setParameters(keyValuePairs); AudioSystem.setParameters(keyValuePairs);
} }
/**
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setHfpEnabled(boolean enable) {
AudioSystem.setParameters("hfp_enable=" + enable);
}
/**
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setHfpVolume(int volume) {
AudioSystem.setParameters("hfp_volume=" + volume);
}
/**
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setHfpSamplingRate(int rate) {
AudioSystem.setParameters("hfp_set_sampling_rate=" + rate);
}
/**
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setBluetoothHeadsetProperties(@NonNull String name, boolean hasNrecEnabled,
boolean hasWbsEnabled) {
AudioSystem.setParameters("bt_headset_name=" + name
+ ";bt_headset_nrec=" + (hasNrecEnabled ? "on" : "off")
+ ";bt_wbs=" + (hasWbsEnabled ? "on" : "off"));
}
/**
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.BLUETOOTH_STACK)
public void setA2dpSuspended(boolean enable) {
AudioSystem.setParameters("A2dpSuspended=" + enable);
}
/** /**
* Gets a variable number of parameter values from audio hardware. * Gets a variable number of parameter values from audio hardware.
* *