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

Commit 458782b1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "BluetoothAdapter#connectAllEnabledProfiles and... 

Merge "BluetoothAdapter#connectAllEnabledProfiles and BluetoothAdapter#disconnectAllEnabledProfiles updated to require BLUETOOTH_PRIVILEGED permission and update documentation to indicate connection and disconnection is asynchronous" am: 750ab04052 am: 9d808a12

Change-Id: Ie5d4e5b0e38d4d394d94811cebcf720ba17bfb5b
parents 02ca3165 9d808a12

framework/java/android/bluetooth/BluetoothAdapter.java

+14 −6
Original line number Diff line number Diff line
@@ -1861,15 +1861,19 @@ public final class BluetoothAdapter { 
    }



    /**

     * Connects all enabled and supported bluetooth profiles between the local and remote device

     * Connects all enabled and supported bluetooth profiles between the local and remote device.

     * Connection is asynchronous and you should listen to each profile's broadcast intent

     * ACTION_CONNECTION_STATE_CHANGED to verify whether connection was successful. For example,

     * to verify a2dp is connected, you would listen for

     * {@link BluetoothA2dp#ACTION_CONNECTION_STATE_CHANGED}

     *

     * @param device is the remote device with which to connect these profiles

     * @return true if all profiles successfully connected, false if an error occurred

     * @return true if message sent to try to connect all profiles, false if an error occurred

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean connectAllEnabledProfiles(@NonNull BluetoothDevice device) {

        try {

            mServiceLock.readLock().lock();
@@ -1886,15 +1890,19 @@ public final class BluetoothAdapter { 
    }



    /**

     * Disconnects all enabled and supported bluetooth profiles between the local and remote device

     * Disconnects all enabled and supported bluetooth profiles between the local and remote device.

     * Disconnection is asynchronous and you should listen to each profile's broadcast intent

     * ACTION_CONNECTION_STATE_CHANGED to verify whether disconnection was successful. For example,

     * to verify a2dp is disconnected, you would listen for

     * {@link BluetoothA2dp#ACTION_CONNECTION_STATE_CHANGED}

     *

     * @param device is the remote device with which to disconnect these profiles

     * @return true if all profiles successfully disconnected, false if an error occurred

     * @return true if message sent to try to disconnect all profiles, false if an error occurred

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean disconnectAllEnabledProfiles(@NonNull BluetoothDevice device) {

        try {

            mServiceLock.readLock().lock();