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

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

Merge changes I2e08d8f0,Id591d406 into main am: ef7b596f 

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



Change-Id: If87558695682050d25546d503f8b7180b2298397
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f08d83ab ef7b596f

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+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)

android/app/src/com/android/bluetooth/btservice/PhonePolicy.java

+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);

android/app/src/com/android/bluetooth/hid/HidHostService.java

+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;

flags/hid.aconfig

+0 −17
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "break_uhid_polling_early"

    namespace: "bluetooth"

    description: "Break from UHID polling early if HID host disconnects"

    bug: "319846147"

}



flag {

    name: "allow_switching_hid_and_hogp"

    is_exported: true
@@ -36,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"

system/bta/hh/bta_hh_headtracker.cc

+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};