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

Commit 93326cfd authored by Marie Janssen's avatar Marie Janssen Committed by Ajay Panicker
Browse files

Fix setPairingConfirmation permissions issue (2/2) 

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55
parent 014016cf

core/java/android/bluetooth/BluetoothDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -1153,12 +1153,12 @@ public final class BluetoothDevice implements Parcelable { 


    /**

     * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.

     *

     * @return true confirmation has been sent out

     *         false for error

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setPairingConfirmation(boolean confirm) {

        if (sService == null) {

            Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");