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

Commit d41c5776 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22768 into eclair 

* changes:
  Fix authorization check for Audio Source.
parents 23b1a470 b23d4458

core/java/android/server/BluetoothEventLoop.java

+4 −1
Original line number Diff line number Diff line
@@ -430,8 +430,10 @@ class BluetoothEventLoop { 


        boolean authorized = false;

        UUID uuid = UUID.fromString(deviceUuid);

        // Bluez sends the UUID of the local service being accessed, _not_ the

        // remote service

        if (mBluetoothService.isEnabled() &&

                (BluetoothUuid.isAudioSink(uuid) || BluetoothUuid.isAvrcpTarget(uuid)

                (BluetoothUuid.isAudioSource(uuid) || BluetoothUuid.isAvrcpTarget(uuid)

                        || BluetoothUuid.isAdvAudioDist(uuid))) {

            BluetoothA2dp a2dp = new BluetoothA2dp(mContext);

            BluetoothDevice device = mAdapter.getRemoteDevice(address);
@@ -444,6 +446,7 @@ class BluetoothEventLoop { 
        } else {

            Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address);

        }

        log("onAgentAuthorize(" + objectPath + ", " + deviceUuid + ") = " + authorized);

        return authorized;

    }