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

Commit 8de9a40a authored by Rahul Sabnis's avatar Rahul Sabnis
Browse files

Add callbacks for preferred audio profiles 

Tag: #feature
Bug: 265031867
Test: atest BluetoothAdapterTest

Change-Id: I152c3491e4d45d4b8bb78c57fabd463c48c665ca
parent 5e416541

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+257 −79

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+6 −6
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ public class DatabaseManager { 


    /**

     * Sets the preferred profile for the supplied audio modes. See

     * {@link BluetoothDevice#setPreferredAudioProfiles(Bundle)} for more details.

     * {@link BluetoothAdapter#setPreferredAudioProfiles(BluetoothDevice, Bundle)} for more details.

     *

     * @param device is the remote device for which we are setting the preferred audio profiles

     * @param modeToProfileBundle contains the preferred profile
@@ -796,8 +796,8 @@ public class DatabaseManager { 


            // Updates preferred audio profiles for the device

            Metadata metadata = mMetadataCache.get(address);

            int outputProfile = modeToProfileBundle.getInt(BluetoothDevice.AUDIO_MODE_OUTPUT_ONLY);

            int duplexProfile = modeToProfileBundle.getInt(BluetoothDevice.AUDIO_MODE_DUPLEX);

            int outputProfile = modeToProfileBundle.getInt(BluetoothAdapter.AUDIO_MODE_OUTPUT_ONLY);

            int duplexProfile = modeToProfileBundle.getInt(BluetoothAdapter.AUDIO_MODE_DUPLEX);

            if (outputProfile != 0) {

                Log.i(TAG, "setPreferredAudioProfiles: Updating output only audio profile for "

                        + "device: " + device + " to "
@@ -817,7 +817,7 @@ public class DatabaseManager { 


    /**

     * Sets the preferred profile for the supplied audio modes. See

     * {@link BluetoothDevice#getPreferredAudioProfiles()} for more details.

     * {@link BluetoothAdapter#getPreferredAudioProfiles(BluetoothDevice)} for more details.

     *

     * @param device is the device for which we want to get the preferred audio profiles

     * @return a Bundle containing the preferred audio profiles
@@ -847,11 +847,11 @@ public class DatabaseManager { 


            Bundle modeToProfileBundle = new Bundle();

            if (outputOnlyProfile != 0) {

                modeToProfileBundle.putInt(BluetoothDevice.AUDIO_MODE_OUTPUT_ONLY,

                modeToProfileBundle.putInt(BluetoothAdapter.AUDIO_MODE_OUTPUT_ONLY,

                        outputOnlyProfile);

            }

            if (duplexProfile != 0) {

                modeToProfileBundle.putInt(BluetoothDevice.AUDIO_MODE_DUPLEX, duplexProfile);

                modeToProfileBundle.putInt(BluetoothAdapter.AUDIO_MODE_DUPLEX, duplexProfile);

            }



            return modeToProfileBundle;

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+50 −0
Original line number Diff line number Diff line
@@ -2331,6 +2331,56 @@ public class LeAudioService extends ProfileService { 
                groupId, inputCodecConfig, outputCodecConfig);

    }



    /**

     * Checks if the remote device supports LE Audio duplex (output and input).

     * @param device the remote device to check

     * @return {@code true} if LE Audio duplex is supported, {@code false} otherwise

     */

    public boolean isLeAudioDuplexSupported(BluetoothDevice device) {

        int groupId = getGroupId(device);

        if (groupId == LE_AUDIO_GROUP_ID_INVALID) {

            return false;

        }



        LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);

        if (descriptor == null) {

            return false;

        }

        return (descriptor.mDirection & AUDIO_DIRECTION_OUTPUT_BIT) != 0

                && (descriptor.mDirection & AUDIO_DIRECTION_INPUT_BIT) != 0;

    }



    /**

     * Checks if the remote device supports LE Audio output

     * @param device the remote device to check

     * @return {@code true} if LE Audio output is supported, {@code false} otherwise

     */

    public boolean isLeAudioOutputSupported(BluetoothDevice device) {

        int groupId = getGroupId(device);

        if (groupId == LE_AUDIO_GROUP_ID_INVALID) {

            return false;

        }



        LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);

        if (descriptor == null) {

            return false;

        }

        return (descriptor.mDirection & AUDIO_DIRECTION_OUTPUT_BIT) != 0;

    }



    /**

     * Gets the lead device for the CSIP group containing the provided device

     * @param device the remote device whose CSIP group lead device we want to find

     * @return the lead device of the CSIP group or {@code null} if the group does not exist

     */

    public BluetoothDevice getLeadDevice(BluetoothDevice device) {

        int groupId = getGroupId(device);

        if (groupId == LE_AUDIO_GROUP_ID_INVALID) {

            return null;

        }

        return getConnectedGroupLeadDevice(groupId);

    }



    /**

     * Binder object: must be a static class or memory leak may occur

     */

framework/api/system-current.txt

+11 −4
Original line number Diff line number Diff line
@@ -62,12 +62,14 @@ package android.bluetooth { 
    method public int getConnectionState();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public long getDiscoveryEndMillis();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getMostRecentlyConnectedDevices();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.os.Bundle getPreferredAudioProfiles(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<java.lang.Integer> getSupportedProfiles();

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.os.ParcelUuid> getUuidsList();

    method public boolean isBleScanAlwaysAvailable();

    method public boolean isLeEnabled();

    method @NonNull public static String nameForState(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean registerBluetoothConnectionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int registerPreferredAudioProfilesChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.PreferredAudioProfilesChangedCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean removeActiveDevice(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void requestControllerActivityEnergyInfo(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnBluetoothActivityEnergyInfoCallback);
@@ -75,16 +77,20 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setActiveDevice(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int setBluetoothHciSnoopLoggingMode(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setDiscoverableTimeout(@NonNull java.time.Duration);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setPreferredAudioProfiles(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.os.Bundle);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setScanMode(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int startRfcommServer(@NonNull String, @NonNull java.util.UUID, @NonNull android.app.PendingIntent);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int stopRfcommServer(@NonNull java.util.UUID);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean unregisterBluetoothConnectionCallback(@NonNull android.bluetooth.BluetoothAdapter.BluetoothConnectionCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int unregisterPreferredAudiProfilesChangedCallback(@NonNull android.bluetooth.BluetoothAdapter.PreferredAudioProfilesChangedCallback);

    field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";

    field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_DISABLE = "android.bluetooth.adapter.action.REQUEST_DISABLE";

    field public static final int ACTIVE_DEVICE_ALL = 2; // 0x2

    field public static final int ACTIVE_DEVICE_AUDIO = 0; // 0x0

    field public static final int ACTIVE_DEVICE_PHONE_CALL = 1; // 0x1

    field public static final String AUDIO_MODE_DUPLEX = "audio_mode_duplex";

    field public static final String AUDIO_MODE_OUTPUT_ONLY = "audio_mode_output_only";

    field public static final int BT_SNOOP_LOG_MODE_DISABLED = 0; // 0x0

    field public static final int BT_SNOOP_LOG_MODE_FILTERED = 1; // 0x1

    field public static final int BT_SNOOP_LOG_MODE_FULL = 2; // 0x2
@@ -113,6 +119,10 @@ package android.bluetooth { 
    method public void onOobData(int, @NonNull android.bluetooth.OobData);

  }



  public static interface BluetoothAdapter.PreferredAudioProfilesChangedCallback {

    method public void onPreferredAudioProfilesChanged(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.os.Bundle, int);

  }



  public final class BluetoothAudioPolicy implements android.os.Parcelable {

    method public int getCallEstablishPolicy();

    method public int getConnectingTimePolicy();
@@ -176,7 +186,6 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getMessageAccessPermission();

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public byte[] getMetadata(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getPhonebookAccessPermission();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.os.Bundle getPreferredAudioProfiles();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getSimAccessPermission();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isBondingInitiatedLocally();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isConnected();
@@ -190,7 +199,6 @@ package android.bluetooth { 
    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setMetadata(int, @NonNull byte[]);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPhonebookAccessPermission(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setPin(@NonNull String);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int setPreferredAudioProfiles(@NonNull android.os.Bundle);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setSilenceMode(boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setSimAccessPermission(int);

    field public static final int ACCESS_ALLOWED = 1; // 0x1
@@ -203,8 +211,6 @@ package android.bluetooth { 
    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PAIRING_CANCEL = "android.bluetooth.device.action.PAIRING_CANCEL";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_SILENCE_MODE_CHANGED = "android.bluetooth.device.action.SILENCE_MODE_CHANGED";

    field @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public static final String ACTION_SWITCH_BUFFER_SIZE = "android.bluetooth.device.action.SWITCH_BUFFER_SIZE";

    field public static final String AUDIO_MODE_DUPLEX = "audio_mode_duplex";

    field public static final String AUDIO_MODE_OUTPUT_ONLY = "audio_mode_output_only";

    field public static final int BATTERY_LEVEL_BLUETOOTH_OFF = -100; // 0xffffff9c

    field public static final int BATTERY_LEVEL_UNKNOWN = -1; // 0xffffffff

    field public static final int CONNECTION_ACCESS_NO = 2; // 0x2
@@ -708,6 +714,7 @@ package android.bluetooth { 
    field public static final int ERROR_AUDIO_DEVICE_ALREADY_DISCONNECTED = 1117; // 0x45d

    field public static final int ERROR_AUDIO_ROUTE_BLOCKED = 1118; // 0x45e

    field public static final int ERROR_BAD_PARAMETERS = 21; // 0x15

    field public static final int ERROR_CALLBACK_NOT_REGISTERED = 28; // 0x1c

    field public static final int ERROR_CALL_ACTIVE = 1119; // 0x45f

    field public static final int ERROR_CSIP_GROUP_LOCKED_BY_OTHER = 1208; // 0x4b8

    field public static final int ERROR_CSIP_INVALID_GROUP_ID = 1207; // 0x4b7

framework/java/android/bluetooth/BluetoothAdapter.java

+383 −5

File changed.

Preview size limit exceeded, changes collapsed.