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

Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied9742a6d57932986ed4579b7760250f156cf415
This commit is contained in:
More Kuo
2021-02-24 01:23:48 +00:00
committed by Automerger Merge Worker
parent 2c842f3aa7 e90bacbc0a
commit 51beeda872
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/system-current.txt
View File

@@ -1431,7 +1431,7 @@ package android.bluetooth {
method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public android.bluetooth.BufferConstraints getBufferConstraints(); method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public android.bluetooth.BufferConstraints getBufferConstraints();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getDynamicBufferSupport(); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getDynamicBufferSupport();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setBufferMillis(int, int); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setBufferLengthMillis(int, int);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD = 1; // 0x1 field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD = 1; // 0x1
field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING = 2; // 0x2 field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING = 2; // 0x2
@@ -1636,7 +1636,7 @@ package android.bluetooth {
public final class BufferConstraints implements android.os.Parcelable { public final class BufferConstraints implements android.os.Parcelable {
ctor public BufferConstraints(@NonNull java.util.List<android.bluetooth.BufferConstraint>); ctor public BufferConstraints(@NonNull java.util.List<android.bluetooth.BufferConstraint>);
method public int describeContents(); method public int describeContents();
method @Nullable public android.bluetooth.BufferConstraint getCodec(int); method @Nullable public android.bluetooth.BufferConstraint forCodec(int);
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field public static final int BUFFER_CODEC_MAX_NUM = 32; // 0x20 field public static final int BUFFER_CODEC_MAX_NUM = 32; // 0x20
field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BufferConstraints> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BufferConstraints> CREATOR;

7
core/java/android/bluetooth/BluetoothA2dp.java
View File

@@ -943,12 +943,13 @@ public final class BluetoothA2dp implements BluetoothProfile {
*/ */
@SystemApi @SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setBufferMillis(@BluetoothCodecConfig.SourceCodecType int codec, int value) { public boolean setBufferLengthMillis(@BluetoothCodecConfig.SourceCodecType int codec,
if (VDBG) log("setBufferMillis(" + codec + ", " + value + ")"); int value) {
if (VDBG) log("setBufferLengthMillis(" + codec + ", " + value + ")");
try { try {
final IBluetoothA2dp service = getService(); final IBluetoothA2dp service = getService();
if (service != null && isEnabled()) { if (service != null && isEnabled()) {
return service.setBufferMillis(codec, value); return service.setBufferLengthMillis(codec, value);
} }
if (service == null) Log.w(TAG, "Proxy not attached to service"); if (service == null) Log.w(TAG, "Proxy not attached to service");
return false; return false;

2
core/java/android/bluetooth/BufferConstraints.java
View File

@@ -90,7 +90,7 @@ public final class BufferConstraints implements Parcelable {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public @Nullable BufferConstraint getCodec(@BluetoothCodecConfig.SourceCodecType int codec) { public @Nullable BufferConstraint forCodec(@BluetoothCodecConfig.SourceCodecType int codec) {
return mBufferConstraints.get(codec); return mBufferConstraints.get(codec);
} }
} }