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

Commit 69c20018 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I9ea7630d,Ia322147e into tm-qpr-dev am: c615c439 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20280288



Change-Id: Ic073b198e5cd81f78b76d400e9a62a564be98340
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1885b0ca c615c439

android/app/src/com/android/bluetooth/mcp/McpService.java

+4 −4
Original line number Diff line number Diff line
@@ -206,10 +206,10 @@ public class McpService extends ProfileService { 
         * 2. authorized devices

         * 3. Any LeAudio devices which are allowed to connect

         */

        if (mDeviceAuthorizations.getOrDefault(device, Utils.isPtsTestMode()

                ? BluetoothDevice.ACCESS_ALLOWED : BluetoothDevice.ACCESS_UNKNOWN)

                        == BluetoothDevice.ACCESS_ALLOWED) {

            return BluetoothDevice.ACCESS_ALLOWED;

        int authorization = mDeviceAuthorizations.getOrDefault(device, Utils.isPtsTestMode()

                ? BluetoothDevice.ACCESS_ALLOWED : BluetoothDevice.ACCESS_UNKNOWN);

        if (authorization != BluetoothDevice.ACCESS_UNKNOWN) {

            return authorization;

        }



        LeAudioService leAudioService = LeAudioService.getLeAudioService();