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

Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" am: 3c57a25b4f am: 5404d58320

Browse Source 
Change-Id: I324d018836d973b548c037285b22e8030774ce31
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:44:10 +00:00
parent 51fa4ab3b5 5404d58320
commit 8acee1db54
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -1424,7 +1424,7 @@ package android.bluetooth {
} }
public final class BluetoothHidDevice implements android.bluetooth.BluetoothProfile { public final class BluetoothHidDevice implements android.bluetooth.BluetoothProfile {
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
} }
public final class BluetoothHidHost implements android.bluetooth.BluetoothProfile { public final class BluetoothHidHost implements android.bluetooth.BluetoothProfile {

2
core/java/android/bluetooth/BluetoothHidDevice.java
View File

@@ -706,7 +706,7 @@ public final class BluetoothHidDevice implements BluetoothProfile {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setConnectionPolicy(@NonNull BluetoothDevice device, public boolean setConnectionPolicy(@NonNull BluetoothDevice device,
@ConnectionPolicy int connectionPolicy) { @ConnectionPolicy int connectionPolicy) {
log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")"); log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");