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

Commit d0ccfcfd authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Make Android Headtracker Service a restricted service" into main am: 1de36803 

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



Change-Id: Id470fd3c5d5e4f3a8f1db4365af97d812f9bb8ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8006ec2c 1de36803

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

+9 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.bluetooth.btservice.CompanionManager; 
import com.android.bluetooth.btservice.MetricsLogger;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.hid.HidHostService;

import com.android.bluetooth.le_scan.TransitionalScanHelper;

import com.android.internal.annotations.VisibleForTesting;
@@ -3387,8 +3388,15 @@ public class GattService extends ProfileService { 
        return false;

    }



    private boolean isAndroidHeadtrackerSrvcUuid(final UUID uuid) {

        return HidHostService.ANDROID_HEADTRACKER_UUID.getUuid().equals(uuid);

    }



    private boolean isRestrictedSrvcUuid(final UUID uuid) {

        return isFidoSrvcUuid(uuid) || isAndroidTvRemoteSrvcUuid(uuid) || isLeAudioSrvcUuid(uuid);

        return isFidoSrvcUuid(uuid)

                || isAndroidTvRemoteSrvcUuid(uuid)

                || isLeAudioSrvcUuid(uuid)

                || isAndroidHeadtrackerSrvcUuid(uuid);

    }



    private int getDeviceType(BluetoothDevice device) {