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

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

Merge "floss: Event filter should not auto accept connections" am: a7d9f3d1... 

Merge "floss: Event filter should not auto accept connections" am: a7d9f3d1 am: 6c7fb141 am: a9fc509b

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



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

system/gd/hci/controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ void Controller::AllowWakeByHid() { 
  // Allow Classic HID

  auto class_of_device = ClassOfDevice::FromUint32Legacy(COD_HID_MAJOR).value();

  auto class_of_device_mask = ClassOfDevice::FromUint32Legacy(COD_HID_MASK).value();

  auto auto_accept_flag = AutoAcceptFlag::AUTO_ACCEPT_ON_ROLE_SWITCH_ENABLED;

  auto auto_accept_flag = AutoAcceptFlag::AUTO_ACCEPT_OFF;

  std::unique_ptr<SetEventFilterConnectionSetupClassOfDeviceBuilder> packet =

      SetEventFilterConnectionSetupClassOfDeviceBuilder::Create(

          class_of_device, class_of_device_mask, auto_accept_flag);

system/gd/rust/linux/stack/src/suspend.rs

+2 −2
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ impl ISuspend for Suspend { 


    fn resume(&mut self) -> bool {

        self.intf.lock().unwrap().set_default_event_mask_except(0u64, 0u64);

        self.intf.lock().unwrap().set_event_filter_inquiry_result_all_devices();

        self.intf.lock().unwrap().set_event_filter_connection_setup_all_devices();

        self.intf.lock().unwrap().clear_event_filter();



        if self.is_connected_suspend {

            if self.was_a2dp_connected {

                // TODO(230604670): reconnect to a2dp device