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

Commit f451479e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gatt: correct some trivial checks" am: f4bb3dfc am: 4e03c03a 

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

Change-Id: Iab17dca149a4689eb6ffea18f0d25b64d787855e
parents b3cf092a 4e03c03a

android/app/src/com/android/bluetooth/gatt/GattService.java

+9 −4
Original line number Diff line number Diff line
@@ -3779,13 +3779,18 @@ public class GattService extends ProfileService { 
    }



    private boolean isLeAudioSrvcUuid(final UUID uuid) {

        return LE_AUDIO_SERVICE_UUIDS.equals(uuid);

        for (UUID leAudioUuid : LE_AUDIO_SERVICE_UUIDS) {

            if (leAudioUuid.equals(uuid)) {

                return true;

            }

        }

        return false;

    }



    private boolean isRestrictedSrvcUuid(final UUID uuid) {

        return isLeAudioSrvcUuid(uuid) ||

               isAndroidTvRemoteSrvcUuid(uuid) ||

               isLeAudioSrvcUuid(uuid);

        return isFidoSrvcUuid(uuid)

                || isAndroidTvRemoteSrvcUuid(uuid)

                || isLeAudioSrvcUuid(uuid);

    }



    private int getDeviceType(BluetoothDevice device) {