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

Commit 2bcc23ad authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Enforce BLUETOOTH_PRIVILEGED permission in... 

Merge "Enforce BLUETOOTH_PRIVILEGED permission in HidDeviceService#setConnectionPolicy" am: 69421b91 am: cee58b24 am: 34d12b48

Change-Id: I97d828b98e5e028832e237401cc90bdd9f497e36
parents fe4346df 34d12b48

android/app/src/com/android/bluetooth/hid/HidDeviceService.java

+2 −1
Original line number Diff line number Diff line
@@ -658,7 +658,8 @@ public class HidDeviceService extends ProfileService { 
     * @return true if hid device is connected or disconnected, false otherwise

     */

    public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        enforceCallingOrSelfPermission(

                BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");

        if (DBG) {

            Log.d(TAG, "setConnectionPolicy: device " + device

                    + " and connectionPolicy " + connectionPolicy);