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

Commit 356980b7 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "A2dp: Use Collection as return type for getSupportedCodecTypes()" into main

parents 18bd5901 94cfba6a

framework/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<android.bluetooth.BluetoothCodecType> getSupportedCodecTypes();

    method @FlaggedApi("com.android.bluetooth.flags.a2dp_offload_codec_extensibility") @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.Collection<android.bluetooth.BluetoothCodecType> getSupportedCodecTypes();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isA2dpPlaying(android.bluetooth.BluetoothDevice);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PLAYING_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.modules.utils.SynchronousResultReceiver; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Collection;

import java.util.List;

import java.util.concurrent.TimeoutException;
@@ -744,7 +745,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @RequiresLegacyBluetoothPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    @FlaggedApi(Flags.FLAG_A2DP_OFFLOAD_CODEC_EXTENSIBILITY)

    public List<BluetoothCodecType> getSupportedCodecTypes() {

    public Collection<BluetoothCodecType> getSupportedCodecTypes() {

        Log.d(TAG, "getSupportedSourceCodecTypes()");

        final IBluetoothA2dp service = getService();

        List<BluetoothCodecType> defaultValue = new ArrayList<>();