Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: a09e9e4fe1

Browse Source 
Change-Id: I576a4f4f233f2e84d623d739090141e862db38d8
This commit is contained in:
Automerger Merge Worker
2020-02-25 09:56:24 +00:00
parent eebf830623 a09e9e4fe1
commit 4b67009cb2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/bluetooth/BluetoothPbap.java
View File

@@ -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