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

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

Merge "Remove the input device record on virtual unplug" into main am: 6ddb61d6 am: 52c3662d 

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



Change-Id: I5b91d391a68505669ebfac31dc5ff3946b51f02c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed43e44c 52c3662d

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

+9 −3
Original line number Diff line number Diff line
@@ -519,10 +519,16 @@ public class HidHostService extends ProfileService { 


    private void handleMessageOnVirtualUnplug(Message msg) {

        BluetoothDevice device = mAdapterService.getDeviceFromByte((byte[]) msg.obj);

        if (Flags.removeInputDeviceOnVup()) {

            updateConnectionState(

                    device, getTransport(device), BluetoothProfile.STATE_DISCONNECTED);

            mInputDevices.remove(device);

        } else {

            int transport = msg.arg1;

            if (!checkTransport(device, transport, msg.what)) {

                return;

            }

        }

        int status = msg.arg2;

        broadcastVirtualUnplugStatus(device, status);

    }