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

Commit 5404d583 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi... 

Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" am: 3c57a25b

Change-Id: I37da24b0dd04118a937378414412ee17acf79c70
parents 2f8ac6dd 3c57a25b

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,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 {

































core/java/android/bluetooth/BluetoothHidDevice.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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 + ")");