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

Merge "Add setConnectionPolicy to BluetoothPbap"

Browse Source 
am: c0c8c00976

Change-Id: I96a64f6a86392f1140884fc03f8059b5590e8736
This commit is contained in:
Rahul Sabnis
2020-01-07 12:56:19 -08:00
committed by android-build-merger
parent 6aca95071a c0c8c00976
commit 53c8e6cbc0
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -1429,6 +1429,7 @@ package android.bluetooth {
public class BluetoothPbap implements android.bluetooth.BluetoothProfile { public class BluetoothPbap implements android.bluetooth.BluetoothProfile {
method public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice); method public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED"; field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED";
} }

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

@@ -16,7 +16,10 @@
package android.bluetooth; package android.bluetooth;
import android.Manifest;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SdkConstant; import android.annotation.SdkConstant;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
@@ -270,6 +273,42 @@ public class BluetoothPbap implements BluetoothProfile {
return new ArrayList<BluetoothDevice>(); return new ArrayList<BluetoothDevice>();
} }
/**
* Pbap does not store connection policy, so this function only disconnects Pbap if
* connectionPolicy is CONNECTION_POLICY_FORBIDDEN.
*
* <p> The device should already be paired.
* Connection policy can be one of {@link #CONNECTION_POLICY_ALLOWED},
* {@link #CONNECTION_POLICY_FORBIDDEN}, {@link #CONNECTION_POLICY_UNKNOWN}
*
* @param device Paired bluetooth device
* @param connectionPolicy is the connection policy to set to for this profile
* @return true if pbap is successfully disconnected, false otherwise
* @hide
*/
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
public boolean setConnectionPolicy(@NonNull BluetoothDevice device,
@ConnectionPolicy int connectionPolicy) {
if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");
try {
final IBluetoothPbap service = mService;
if (service != null && isEnabled()
&& isValidDevice(device)) {
if (connectionPolicy != BluetoothProfile.CONNECTION_POLICY_FORBIDDEN
&& connectionPolicy != BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
return false;
}
return service.setConnectionPolicy(device, connectionPolicy);
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return false;
} catch (RemoteException e) {
Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
return false;
}
}
/** /**
* Disconnects the current Pbap client (PCE). Currently this call blocks, * Disconnects the current Pbap client (PCE). Currently this call blocks,
* it may soon be made asynchronous. Returns false if this proxy object is * it may soon be made asynchronous. Returns false if this proxy object is