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

Commit cfcd5d5a authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Remove flag android_headtracker_service

Change-Id: I2e08d8f078044d9b311c7d2e591a665f9bcb132e
Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.android_headtracker_service
Bug: 335708774
parent cde9b32d
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -1717,9 +1717,8 @@ public class AdapterService extends Service {
        if (profile == BluetoothProfile.HID_HOST) {
            return Utils.arrayContains(remoteDeviceUuids, BluetoothUuid.HID)
                    || Utils.arrayContains(remoteDeviceUuids, BluetoothUuid.HOGP)
                    || (Flags.androidHeadtrackerService()
                            && Utils.arrayContains(
                                    remoteDeviceUuids, HidHostService.ANDROID_HEADTRACKER_UUID));
                    || Utils.arrayContains(
                            remoteDeviceUuids, HidHostService.ANDROID_HEADTRACKER_UUID);
        }
        if (profile == BluetoothProfile.HID_DEVICE) {
            return mHidDeviceService.getConnectionState(device)
+1 −3
Original line number Diff line number Diff line
@@ -321,9 +321,7 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
        if ((hidService != null)
                && (Utils.arrayContains(uuids, BluetoothUuid.HID)
                        || Utils.arrayContains(uuids, BluetoothUuid.HOGP)
                        || (Flags.androidHeadtrackerService()
                                && Utils.arrayContains(
                                        uuids, HidHostService.ANDROID_HEADTRACKER_UUID)))
                        || Utils.arrayContains(uuids, HidHostService.ANDROID_HEADTRACKER_UUID))
                && (hidService.getConnectionPolicy(device) == CONNECTION_POLICY_UNKNOWN)) {
            if (mAutoConnectProfilesSupported) {
                hidService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);
+2 −4
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ public class HidHostService extends ProfileService {
        if (!Flags.allowSwitchingHidAndHogp()) {
            boolean hogpSupported = Utils.arrayContains(uuids, BluetoothUuid.HOGP);
            boolean headtrackerSupported =
                    Flags.androidHeadtrackerService()
                            && Utils.arrayContains(uuids, HidHostService.ANDROID_HEADTRACKER_UUID);
                    Utils.arrayContains(uuids, HidHostService.ANDROID_HEADTRACKER_UUID);

            if (hogpSupported || headtrackerSupported) {
                // Use pseudo address when HOGP is available
@@ -1100,8 +1099,7 @@ public class HidHostService extends ProfileService {
        boolean hidSupported = Utils.arrayContains(uuids, BluetoothUuid.HID);
        boolean hogpSupported = Utils.arrayContains(uuids, BluetoothUuid.HOGP);
        boolean headtrackerSupported =
                Flags.androidHeadtrackerService()
                        && Utils.arrayContains(uuids, HidHostService.ANDROID_HEADTRACKER_UUID);
                Utils.arrayContains(uuids, HidHostService.ANDROID_HEADTRACKER_UUID);
        if (transport == BluetoothDevice.TRANSPORT_BREDR && !hidSupported) {
            Log.w(TAG, "device " + device + " does not support HID");
            return false;
+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ flag {
    }
}

flag {
    name: "android_headtracker_service"
    namespace: "bluetooth"
    description: "Support headtracking through Android Headtracker Service"
    bug: "335708774"
    metadata {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
    name: "suppress_hid_rejection_broadcast"
    namespace: "bluetooth"
+0 −4
Original line number Diff line number Diff line
@@ -138,10 +138,6 @@ void bta_hh_headtracker_parse_service(tBTA_HH_DEV_CB* p_dev_cb, const gatt::Serv
 *
 ******************************************************************************/
bool bta_hh_headtracker_supported(tBTA_HH_DEV_CB* p_dev_cb) {
  if (!com::android::bluetooth::flags::android_headtracker_service()) {
    return false;
  }

  if (p_dev_cb->hid_srvc.headtracker_support == BTA_HH_UNKNOWN) {
    bluetooth::Uuid remote_uuids[BT_MAX_NUM_UUIDS] = {};
    bt_property_t remote_properties = {BT_PROPERTY_UUIDS, sizeof(remote_uuids), &remote_uuids};
Loading