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

Commit 11340711 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am c39c605e: Merge "Change setPin, setPin, setPairingConfirmation permission... 

am c39c605e: Merge "Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED" into klp-dev

* commit 'c39c605e':
  Change setPin, setPin, setPairingConfirmation permission level to BLUETOOTH_PRIVILEGED
parents 95d421a4 c39c605e

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+18 −12
Original line number Diff line number Diff line
@@ -74,8 +74,10 @@ public class AdapterService extends Service { 
    //For Debugging only

    private static int sRefCount=0;



    public static final String ACTION_LOAD_ADAPTER_PROPERTIES="com.android.bluetooth.btservice.action.LOAD_ADAPTER_PROPERTIES";

    public static final String ACTION_SERVICE_STATE_CHANGED="com.android.bluetooth.btservice.action.STATE_CHANGED";

    public static final String ACTION_LOAD_ADAPTER_PROPERTIES =

        "com.android.bluetooth.btservice.action.LOAD_ADAPTER_PROPERTIES";

    public static final String ACTION_SERVICE_STATE_CHANGED =

        "com.android.bluetooth.btservice.action.STATE_CHANGED";

    public static final String EXTRA_ACTION="action";

    public static final int PROFILE_CONN_CONNECTED  = 1;

    public static final int PROFILE_CONN_REJECTED  = 2;
@@ -83,6 +85,8 @@ public class AdapterService extends Service { 
    static final String BLUETOOTH_ADMIN_PERM =

        android.Manifest.permission.BLUETOOTH_ADMIN;

    static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH;

    static final String BLUETOOTH_PRIVILEGED_PERM =

        android.Manifest.permission.BLUETOOTH_PRIVILEGED;



    private static final int ADAPTER_SERVICE_TYPE=Service.START_STICKY;
@@ -1046,8 +1050,8 @@ public class AdapterService extends Service { 
    }



     boolean createBond(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,

            "Need BLUETOOTH ADMIN permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED_PERM,

            "Need BLUETOOTH PRIVILEGED permission");

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp != null && deviceProp.getBondState() != BluetoothDevice.BOND_NONE) {

            return false;
@@ -1266,7 +1270,8 @@ public class AdapterService extends Service { 
    }



     boolean setPin(BluetoothDevice device, boolean accept, int len, byte[] pinCode) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED_PERM,

                                       "Need BLUETOOTH PRIVILEGED permission");

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDING) {

            return false;
@@ -1289,7 +1294,8 @@ public class AdapterService extends Service { 
    }



     boolean setPairingConfirmation(BluetoothDevice device, boolean accept) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED_PERM,

                                       "Need BLUETOOTH PRIVILEGED permission");

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDING) {

            return false;