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

Commit 25ca788a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update javadoc to reflect that BluetoothPbap#setConnectionPolicy... 

Merge "Update javadoc to reflect that BluetoothPbap#setConnectionPolicy returns true on successfully setting the connection policy instead of on disconnection. It also now indicates that if BluetoothProfile#CONNECTION_POLICY_FORBIDDEN is passed in, the profile will be disconnected." am: a09e9e4f am: 4b67009c

Change-Id: I2c45ced103eb119e1a8e57b9d78c9f221decd3ae
parents 5432aa58 4b67009c

core/java/android/bluetooth/BluetoothPbap.java

+9 −6
Original line number Original line Diff line number Diff line
@@ -278,16 +278,19 @@ public class BluetoothPbap implements BluetoothProfile { 
    }

    }





    /**

    /**

     * Pbap does not store connection policy, so this function only disconnects pbap if

     * Set connection policy of the profile and tries to disconnect it if connectionPolicy is

     * connectionPolicy is {@link #CONNECTION_POLICY_FORBIDDEN}.

     * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}

     *

     *

     * <p> The device should already be paired.

     * <p> The device should already be paired.

     * Connection policy can be one of {@link #CONNECTION_POLICY_ALLOWED},

     * Connection policy can be one of:

     * {@link #CONNECTION_POLICY_FORBIDDEN}, {@link #CONNECTION_POLICY_UNKNOWN}

     * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},

     * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},

     * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}

     *

     *

     * @param device Paired bluetooth device

     * @param device Paired bluetooth device

     * @param connectionPolicy determines whether to disconnect the device

     * @param connectionPolicy is the connection policy to set to for this profile

     * @return true if pbap is successfully disconnected, false otherwise

     * @return true if connectionPolicy is set, false on error

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi