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

Commit e90bacbc authored by More Kuo's avatar More Kuo Committed by Automerger Merge Worker
Browse files

Merge "Update BluetoothA2dp API" am: ae6583b3 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fc9c4dad0013ecd62788417054f872f29dc775f
parents 0de60cd4 ae6583b3

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ package android.bluetooth { 
    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 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);

    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
@@ -1636,7 +1636,7 @@ package android.bluetooth { 
  public final class BufferConstraints implements android.os.Parcelable {

    ctor public BufferConstraints(@NonNull java.util.List<android.bluetooth.BufferConstraint>);

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

    field public static final int BUFFER_CODEC_MAX_NUM = 32; // 0x20

    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BufferConstraints> CREATOR;

core/java/android/bluetooth/BluetoothA2dp.java

+4 −3
Original line number Diff line number Diff line
@@ -943,12 +943,13 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setBufferMillis(@BluetoothCodecConfig.SourceCodecType int codec, int value) {

        if (VDBG) log("setBufferMillis(" + codec + ", " + value + ")");

    public boolean setBufferLengthMillis(@BluetoothCodecConfig.SourceCodecType int codec,

            int value) {

        if (VDBG) log("setBufferLengthMillis(" + codec + ", " + value + ")");

        try {

            final IBluetoothA2dp service = getService();

            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");

            return false;

core/java/android/bluetooth/BufferConstraints.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public final class BufferConstraints implements Parcelable { 
     * @hide

     */

    @SystemApi

    public @Nullable BufferConstraint getCodec(@BluetoothCodecConfig.SourceCodecType int codec) {

    public @Nullable BufferConstraint forCodec(@BluetoothCodecConfig.SourceCodecType int codec) {

        return mBufferConstraints.get(codec);

    }

}