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

Commit 10e9c8c5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update javadoc for BluetoothPbapService#setConnectionPolicy to remove... 

Merge "Update javadoc for BluetoothPbapService#setConnectionPolicy to remove erroneous statement that the profile will be connected if caller passes in BluetoothProfile.CONNECTION_POLICY_ALLOWED" am: 939d10bc am: 5106446a

Change-Id: I5681ab76701d6e6a76a1b83635c9b1f52860a848
parents 8680e433 5106446a

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −2
Original line number Diff line number Diff line
@@ -471,8 +471,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
    }



    /**

     * Set connection policy of the profile and connects it if connectionPolicy is

     * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED} or disconnects if connectionPolicy is

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

     * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}

     *

     * <p> The device should already be paired.