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 am: 8acee1db54

Browse Source 
Change-Id: Idaab46acf3e38332bcbf4606de39a4656e3339d5
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:56:25 +00:00
parent 8af001934a 8acee1db54
commit 0b440628dd
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

@@ -1604,7 +1604,7 @@ package android.bluetooth {
}
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 {

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

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