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

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

Merge "Use appropriate addresses with HID and HOGP" into main am: dda974be 

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



Change-Id: Ie8f59e48b21031d6a2535ecf24153c496f24675f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 426dee65 dda974be

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

+41 −14
Original line number Diff line number Diff line
@@ -193,20 +193,47 @@ public class HidHostService extends ProfileService { 
        setHidHostService(null);

    }



    private byte[] getByteAddress(BluetoothDevice device) {

    private byte[] getIdentityAddress(BluetoothDevice device) {

        if (Flags.identityAddressNullIfUnknown()) {

            return Utils.getByteBrEdrAddress(device);

        } else {

            return mAdapterService.getByteIdentityAddress(device);

        }

    }



    private byte[] getByteAddress(BluetoothDevice device, int transport) {

        if (!Flags.allowSwitchingHidAndHogp()) {

            if (Utils.arrayContains(device.getUuids(), BluetoothUuid.HOGP)) {

                // Use pseudo address when HOGP is available

                return Utils.getByteAddress(device);

            } else {

            // Use BR/EDR address if only HID is available

            if (Flags.identityAddressNullIfUnknown()) {

                return Utils.getByteBrEdrAddress(device);

                // Otherwise use identity address

                return getIdentityAddress(device);

            }

        }



        if (transport == BluetoothDevice.TRANSPORT_LE) {

            // Use pseudo address when HOGP is to be used

            return Utils.getByteAddress(device);

        } else if (transport == BluetoothDevice.TRANSPORT_BREDR) {

            // Use identity address if HID is to be used

            return getIdentityAddress(device);

        } else { // BluetoothDevice.TRANSPORT_AUTO

            // Prefer HID over HOGP

            if (Utils.arrayContains(device.getUuids(), BluetoothUuid.HID)) {

                // Use identity address if HID is available

                return getIdentityAddress(device);

            } else {

                return mAdapterService.getByteIdentityAddress(device);

                // Otherwise use pseudo address

                return Utils.getByteAddress(device);

            }

        }

    }



    private byte[] getByteAddress(BluetoothDevice device) {

        return getByteAddress(device, getTransport(device));

    }



    /**

     * Retrieves device address type

     *
@@ -301,7 +328,7 @@ public class HidHostService extends ProfileService { 
     */

    private boolean nativeConnect(BluetoothDevice device, int transport) {

        if (!mNativeInterface.connectHid(

                getByteAddress(device), getAddressType(device), transport)) {

                getByteAddress(device, transport), getAddressType(device), transport)) {

            Log.w(

                    TAG,

                    "nativeConnect: "
@@ -331,7 +358,10 @@ public class HidHostService extends ProfileService { 
    private boolean nativeDisconnect(

            BluetoothDevice device, int transport, boolean reconnectAllowed) {

        if (!mNativeInterface.disconnectHid(

                getByteAddress(device), getAddressType(device), transport, reconnectAllowed)) {

                getByteAddress(device, transport),

                getAddressType(device),

                transport,

                reconnectAllowed)) {

            Log.w(

                    TAG,

                    "nativeDisconnect: "
@@ -1294,10 +1324,7 @@ public class HidHostService extends ProfileService { 
        }



        return mNativeInterface.sendData(

                getByteAddress(device),

                (byte) BluetoothDevice.ADDRESS_TYPE_PUBLIC,

                (byte) BluetoothDevice.TRANSPORT_AUTO,

                report);

                getByteAddress(device), getAddressType(device), getTransport(device), report);

    }



    boolean getIdleTime(BluetoothDevice device) {